Skip to content

O
OKU-GIS
Commit 4307a24b authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

push apex + cesium on trigger

parent 23cae4a3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4472 additions and 4472 deletions
Application/views.py
View file @ 4307a24b
This diff is collapsed.
static/js/maps.js
View file @ 4307a24b
...@@ -2,7 +2,7 @@ var map = L.map('map', { editable: true, zoomControl: false, drawControl: true } ...@@ -2,7 +2,7 @@ var map = L.map('map', { editable: true, zoomControl: false, drawControl: true }
var pool = []; var pool = [];
// var BaseMap = document.getElementById("BaseMap"); var BaseMap = document.getElementById("BaseMap");
var OpenStreetMap = document.getElementById("OpenStreetMap"); var OpenStreetMap = document.getElementById("OpenStreetMap");
var WorldImagery = document.getElementById("WorldImagery"); var WorldImagery = document.getElementById("WorldImagery");
var BingSatellite = document.getElementById("BingSatellite"); var BingSatellite = document.getElementById("BingSatellite");
......
templates/includes/js-m.html
View file @ 4307a24b
...@@ -5803,12 +5803,24 @@ ...@@ -5803,12 +5803,24 @@
// var map_cesium = new Cesium.Viewer('map-cesium'); // var map_cesium = new Cesium.Viewer('map-cesium');
function mapsganti() { //function mapsganti() {
// $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js', function() { // $("#modalsearch3d").modal()
//}
// }); function mapsganti() {
// $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js');
var checkBox_3d = document.getElementById("mapschange"); var checkBox_3d = document.getElementById("mapschange");
$('#scrcesium').append('<script id="scrheadcesium" src="/static/Cesium-185/Build/Cesium/Cesium.js"><\/script>');
var map_cesium = new Cesium.Viewer('map-cesium', {
imageryProvider: new Cesium.BingMapsImageryProvider({
url: '//dev.virtualearth.net',
key: 'Anj9XBZaRShAMdbXJlZ16iqEVpjikY1eY_dzqGl451WYkSKV3l_FJaFgMbhwdbLz',
mapStyle: Cesium.BingMapsStyle.AERIAL
//url : '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer',
//url : Cesium.buildModuleUrl('/static/Cesium-185/Build/Cesium/Assets/Textures/NaturalEarthII')
}),
baseLayerPicker: false,
geocoder: false
});
if (checkBox_3d.checked == true) { if (checkBox_3d.checked == true) {
$("#modalsearch3d").modal() $("#modalsearch3d").modal()
$.ajax({ $.ajax({
...@@ -5832,47 +5844,9 @@ ...@@ -5832,47 +5844,9 @@
} }
$("#search_desa").html(data_de); $("#search_desa").html(data_de);
checkBox_3d.checked = false; checkBox_3d.checked = false;
}
})
} else {
//location.reload();
$("#labelchange").html(`<img src="static/img/icon-1/Vector3d.svg" alt="" style="height: 50px;
width: 50px;">`)
map_cesium.entities.removeAll();
//map_cesium.destroy();
setTimeout(function() {
map.invalidateSize();
}, 1000);
$("#map").css('display', 'block');
$(".no3d").css('display', 'block');
$(".rar").css('display', 'block');
$("#map-cesium").css('display', 'none');
$(".tooltip-3d").html(`3D`)
//$(".filter3d").removeClass("d3filter");
}
}
//function mapsganti() {
// $("#modalsearch3d").modal()
//}
$("#search3D").click(function() { $("#search3D").click(function() {
// $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js'); map_cesium.entities.removeAll();
var map_cesium = new Cesium.Viewer('map-cesium', { // $('head').append('<script src="/static/Cesium-185/Build/Cesium/Cesium.js"><\/script>');
imageryProvider: new Cesium.BingMapsImageryProvider({
url: '//dev.virtualearth.net',
key: 'Anj9XBZaRShAMdbXJlZ16iqEVpjikY1eY_dzqGl451WYkSKV3l_FJaFgMbhwdbLz',
mapStyle: Cesium.BingMapsStyle.AERIAL
//url : '//services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer',
//url : Cesium.buildModuleUrl('/static/Cesium-185/Build/Cesium/Assets/Textures/NaturalEarthII')
}),
baseLayerPicker: false,
geocoder: false
});
$("#map").css('display', 'none'); $("#map").css('display', 'none');
$("#map-cesium").css('display', 'block'); $("#map-cesium").css('display', 'block');
$(".no3d").css('display', 'none'); $(".no3d").css('display', 'none');
...@@ -5891,7 +5865,7 @@ ...@@ -5891,7 +5865,7 @@
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
document.getElementById("mapschange").checked = true; document.getElementById("mapschange").checked = true;
$("#modalsearch3d").modal("toggle") // $("#modalsearch3d").modal("toggle")
// console.log(data['polygon_o']) // console.log(data['polygon_o'])
// console.log(data['line_o']) // console.log(data['line_o'])
// console.log(data['kantor_administrasi']) // console.log(data['kantor_administrasi'])
...@@ -8289,6 +8263,27 @@ ...@@ -8289,6 +8263,27 @@
}); });
}
})
} else {
//location.reload();
$("#labelchange").html(`<img src="static/img/icon-1/Vector3d.svg" alt="" style="height: 50px;
width: 50px;">`)
map_cesium.entities.removeAll();
map_cesium.destroy();
// setTimeout(function() {
// map.invalidateSize();
// }, 1000);
$('#scrcesium').remove();
$("#map").css('display', 'block');
$(".no3d").css('display', 'block');
$(".rar").css('display', 'block');
$("#map-cesium").css('display', 'none');
$(".tooltip-3d").html(`3D`)
//$(".filter3d").removeClass("d3filter");
}
}
function load3dbang() { function load3dbang() {
$(".label-bangunan").css("display", "none"); $(".label-bangunan").css("display", "none");
} }
......
templates/includes/js-o.html
View file @ 4307a24b
...@@ -859,6 +859,8 @@ ...@@ -859,6 +859,8 @@
var checkBox = document.getElementById("batas_desa"); var checkBox = document.getElementById("batas_desa");
if (checkBox.checked == true) { if (checkBox.checked == true) {
// loaderPage(true); // loaderPage(true);
$('#scrapex').append(`<script id="idscrapexmin" type="text/javascript " src="{% static 'js/apexcharts.min.js' %}"><\/script>`);
$('#scrapex').append(`<script id="idscrapex" type="text/javascript " src="{% static 'js/apexcharts.js' %}"><\/script>`);
if (map.hasLayer(geo_batas_kel)) { if (map.hasLayer(geo_batas_kel)) {
geo_batas_kel.clearLayers() geo_batas_kel.clearLayers()
geo_batas_kel.remove() geo_batas_kel.remove()
...@@ -884,6 +886,8 @@ ...@@ -884,6 +886,8 @@
}); });
geo_batas_kel.addTo(map) geo_batas_kel.addTo(map)
} else { } else {
$('#scrapex').remove();
$('#scrapex').remove();
geo_batas_kel.clearLayers() geo_batas_kel.clearLayers()
geo_batas_kel.remove() geo_batas_kel.remove()
} }
......
templates/layout/layout.html
View file @ 4307a24b
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script> <script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"></script>
<!-- <script src="https://cesium.com/downloads/cesiumjs/releases/1.78/Build/Cesium/Cesium.js"></script> --> <!-- <script src="https://cesium.com/downloads/cesiumjs/releases/1.78/Build/Cesium/Cesium.js"></script> -->
<script src="/static/Cesium-185/Build/Cesium/Cesium.js"></script> <!-- <script src="/static/Cesium-185/Build/Cesium/Cesium.js"></script> -->
<link href="{% static 'css/widgets.css' %}" rel="stylesheet"> <link href="{% static 'css/widgets.css' %}" rel="stylesheet">
<link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster@1.4.1/dist/MarkerCluster.css"> <link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster@1.4.1/dist/MarkerCluster.css">
...@@ -851,14 +851,16 @@ ...@@ -851,14 +851,16 @@
<script type="text/javascript" src="{% static 'js/plugins/pickers/daterangepicker.js' %}"></script> <script type="text/javascript" src="{% static 'js/plugins/pickers/daterangepicker.js' %}"></script>
<!-- <script type="text/javascript" src="{% static 'js/plugins/forms/styling/switch.min.js' %}"></script> --> <!-- <script type="text/javascript" src="{% static 'js/plugins/forms/styling/switch.min.js' %}"></script> -->
<!-- <script type="text/javascript" src="{% static 'js/pages/form_checkboxes_radios.js' %}"></script> --> <!-- <script type="text/javascript" src="{% static 'js/pages/form_checkboxes_radios.js' %}"></script> -->
<script type="text/javascript " src="{% static 'js/apexcharts.min.js' %}"></script> <!-- <script type="text/javascript " src="{% static 'js/apexcharts.min.js' %}"></script>
<script type="text/javascript " src="{% static 'js/apexcharts.js' %}"></script> <script type="text/javascript " src="{% static 'js/apexcharts.js' %}"></script> -->
<!-- <script type="text/javascript" src="{% static 'js/plugins/media/cropper.min.js' %}"></script> <!-- <script type="text/javascript" src="{% static 'js/plugins/media/cropper.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/pages/extension_image_cropper.js' %}"></script> --> <script type="text/javascript" src="{% static 'js/pages/extension_image_cropper.js' %}"></script> -->
<!-- /theme JS files --> <!-- /theme JS files -->
<div id ='scrapex'></div>
<div id ='scrcesium'></div>
<script src="{% static 'js/leaflet-bing-layer.js' %}"></script> <script src="{% static 'js/leaflet-bing-layer.js' %}"></script>
...@@ -866,13 +868,9 @@ ...@@ -866,13 +868,9 @@
<script src="{% static 'js/scripts.js' %}"></script> <script src="{% static 'js/scripts.js' %}"></script>
<script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js"></script> <script src="http://code.jquery.com/ui/1.10.2/jquery-ui.js"></script>
{% include 'includes/permission.html' %} {% include 'includes/js-o.html' %} {% include 'includes/js-m.html' %}
</body> <script type="text/javascript" src="{% static 'js/action.js' %}"></script>
<script>
</html>
{% include 'includes/permission.html' %} {% include 'includes/js-o.html' %} {% include 'includes/js-m.html' %}
<script type="text/javascript" src="{% static 'js/action.js' %}"></script>
<script>
// start disabled inspect // start disabled inspect
// document.addEventListener('contextmenu', function(e) { // document.addEventListener('contextmenu', function(e) {
...@@ -3023,7 +3021,15 @@ ...@@ -3023,7 +3021,15 @@
$('.leaflet-bottom.leaflet-right>.leaflet-control-attribution.leaflet-control').html(`Powered by <a href="https://khansia.co.id" target="_blank">Khansia</a> with <a href="https://leafletjs.com" target="_blank">Leaflet</a>`) $('.leaflet-bottom.leaflet-right>.leaflet-control-attribution.leaflet-control').html(`Powered by <a href="https://khansia.co.id" target="_blank">Khansia</a> with <a href="https://leafletjs.com" target="_blank">Leaflet</a>`)
$('.leaflet-bottom.leaflet-right>.leaflet-control-attribution.leaflet-control').css("right", "50px") $('.leaflet-bottom.leaflet-right>.leaflet-control-attribution.leaflet-control').css("right", "50px")
</script> </script>
{% if user.is_authenticated %} {% else %}
<script>
$(".tombol-edit").html('ilang')
</script>
{% endif %}
</body>
</html>
<!-- <script> <!-- <script>
$(function() { $(function() {
...@@ -3134,8 +3140,3 @@ ...@@ -3134,8 +3140,3 @@
} }
} }
</style> </style>
\ No newline at end of file
{% if user.is_authenticated %} {% else %}
<script>
$(".tombol-edit").html('ilang')
</script>
{% endif %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment