Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis

API/urls.py

@@ -8,7 +8,21 @@ from django.contrib.auth.decorators import login_required
 app_name = 'api'
 urlpatterns = [    
     path('search_auto', views.search_auto, name='search'),
+    
+    path('kantor_administrasi', views.kantor_administrasi, name='kantor_administrasi'),
+    path('layanan_kesehatan', views.layanan_kesehatan, name='layanan_kesehatan'),
+    path('apiviewpuskesmas', views.apiviewpuskesmas, name='apiviewpuskesmas'),
+    path('rumah_sakit', views.rumah_sakit, name='rumah_sakit'),
+    path('sarana_ibadah', views.sarana_ibadah, name='sarana_ibadah'),
+    path('sarana_pendidikan', views.sarana_pendidikan, name='sarana_pendidikan'),
+    path('apiviewstasiun', views.apiviewstasiun, name='apiviewstasiun'),
+    path('apiviewterminal', views.apiviewterminal, name='apiviewterminal'),
+    path('apiviewcagarbudaya', views.apiviewcagarbudaya, name='apiviewcagarbudaya'),
+    path('apiviewgardulistrik', views.apiviewgardulistrik, name='apiviewgardulistrik'),
+    
     path('tuplah', views.tuplah, name='tuplah'),
+    path('kecamatan', views.kecamatan, name='kecamatan'),
+    path('desangab', views.desangab, name='desangab'),
     path('building', views.building, name='building'),
     
     path('jalan', views.jalan, name='jalan'),

OKU/settings.py

@@ -85,11 +85,11 @@ DATABASES = {
         'NAME': 'oku_gis_new',
         'USER': 'postgres',
         'PASSWORD' : 'khansia215758',
-        'HOST': '30.10.20.102',
-        'PORT': '5432',
+        # 'HOST': '30.10.20.102',
+        # 'PORT': '5432',
+        'HOST': '103.126.28.66',
+        'PORT': '8082',
         # 'HOST': '103.126.28.66',
-        # 'PORT': '8082',
-        # 'HOST': '125.164.19.183',
         # 'PORT': '5432',  
     }
 }

templates/includes/js-o.html

@@ -62,13 +62,13 @@
     }
 
 
-    var kecamatan = "{{ kecamatan }}".replace(/'/g, '"');
-    var result_kec = JSON.parse("" + kecamatan + "");
+    // var kecamatan = "{{ kecamatan }}".replace(/'/g, '"');
+    // var result_kec = JSON.parse("" + kecamatan + "");
 
     
 
-    var kelurahan = "{{ kelurahan }}".replace(/'/g, '"');
-    var result_kel = JSON.parse("" + kelurahan + "")
+    // var kelurahan = "{{ kelurahan }}".replace(/'/g, '"');
+    // var result_kel = JSON.parse("" + kelurahan + "")
     var geo_batas_kel = batas_desa_desa();
 
     function batas_desa_desa() {
@@ -757,9 +757,6 @@
 
     });
 
-
-
-
     var geo_batas_kec = L.geoJson(null, {
         style: function(feature) {
             return {
@@ -790,9 +787,9 @@
                 },
                 click: function(e) {
                     $("modal_kecamatan").modal('show');
-                    var geocodeService = L.esri.Geocoding.geocodeService();
-                    var geocoderNominatim = new L.Control.Geocoder.Nominatim();
-                    var geogeo = geocodeService.reverse().latlng(e.latlng).run(function(error, result) {
+                    // var geocodeService = L.esri.Geocoding.geocodeService();
+                    // var geocoderNominatim = new L.Control.Geocoder.Nominatim();
+                    // var geogeo = geocodeService.reverse().latlng(e.latlng).run(function(error, result) {
                         console.log(feature.administrasi.f1)
                         content_edit_kec = `
                             <div class="modal-dialog modal-md">
@@ -825,7 +822,7 @@
                                 </div>
                             </div>`;
                             $("#modal_kecamatan").html(content_edit_kec)
-                    });
+                    // });
                     
                 }
             });
@@ -840,9 +837,9 @@
         geo_batas_kec.addData(data)
     }
 
-    geo_json_kel(result_kel);
+    // geo_json_kel(result_kel);
     //geo_json_jalan(result_jln)
-    geo_json_kec(result_kec);
+    // geo_json_kec(result_kec);
 
     function onEachFeature(feature, layer) {
         if (feature.properties && feature.properties.popupContent) {
@@ -852,10 +849,42 @@
 
 
     function batasdesa() {
+        // var checkBox = document.getElementById("batas_desa");
+        // if (checkBox.checked == true) {
+        //     geo_batas_kel.addTo(map)
+        // } else {
+        //     geo_batas_kel.remove()
+        // }
+        // cek_overlay()
         var checkBox = document.getElementById("batas_desa");
         if (checkBox.checked == true) {
+            // loaderPage(true);
+            if (map.hasLayer(geo_batas_kel)) {
+                geo_batas_kel.clearLayers()
+                geo_batas_kel.remove()
+                // geo_batas_kel.addTo(map)
+            }
+            $.ajax({
+                url: "{% url 'api:desangab'%}",
+                dataType: 'json',
+                type: 'GET',
+                success: function(response) {
+                    // loaderPage(false);
+                    // map.setView([-4.125826277307029, 104.1881561279297], 13);
+                    // var len = response['kecamatan'].length;
+                    // console.log(response)
+                    var data_de = []
+                    for (var i = 0; i < response['kembangdesa'].length; i++) {
+                        geoj = response['kembangdesa'][i];
+                        data_de.push(geoj);
+                    }
+                    // console.log(data_de)
+                    geo_json_kel(data_de);
+                }
+            });
             geo_batas_kel.addTo(map)
         } else {
+            geo_batas_kel.clearLayers()
             geo_batas_kel.remove()
         }
         cek_overlay()
@@ -872,10 +901,41 @@
     }
 
     function bataskec() {
+        // var checkBox = document.getElementById("batas_kec");
+        // if (checkBox.checked == true) {
+        //     geo_batas_kec.addTo(map)
+        // } else {
+        //     geo_batas_kec.remove()
+        // }
+        // cek_overlay()
         var checkBox = document.getElementById("batas_kec");
         if (checkBox.checked == true) {
+            // loaderPage(true);
+            if (map.hasLayer(geo_batas_kec)) {
+                geo_batas_kec.clearLayers()
+                geo_batas_kec.remove()
+            }
+            $.ajax({
+                url: "{% url 'api:kecamatan'%}",
+                dataType: 'json',
+                type: 'GET',
+                success: function(response) {
+                    // loaderPage(false);
+                    // map.setView([-4.125826277307029, 104.1881561279297], 13);
+                    // var len = response['kecamatan'].length;
+                    // console.log(response)
+                    var data_de = []
+                    for (var i = 0; i < response['kecamatan'].length; i++) {
+                        geoj = response['kecamatan'][i];
+                        data_de.push(geoj);
+                    }
+                    // console.log(data_de)
+                    geo_json_kec(data_de);
+                }
+            });
             geo_batas_kec.addTo(map)
         } else {
+            geo_batas_kec.clearLayers()
             geo_batas_kec.remove()
         }
         cek_overlay()
@@ -898,9 +958,11 @@
             document.getElementById("batas_kec").checked = true;
             document.getElementById("batas_kota").checked = true;
             document.getElementById("batas_desa").checked = true;
-            geo_batas_kec.addTo(map)
             geo_batas.addTo(map)
-            geo_batas_kel.addTo(map)
+            // geo_batas_kel.addTo(map)
+            // geo_batas_kec.addTo(map)
+            bataskec()
+            batasdesa()
         } else {
             document.getElementById("batas_kec").checked = false;
             document.getElementById("batas_kota").checked = false;

templates/includes/modal.html

@@ -379,7 +379,7 @@
                     <div class="row">
                         <div class="col-md-6">
                             <div class="gambar_kelurahan">
-                                <img src="/static/img/imm.png" alt="" style="width:360px;height:290px;border-top-left-radius: 10px;">
+                                <img src="/static/img/image_null.png" alt="" style="width:360px;height:290px;border-top-left-radius: 10px;">
                             </div>
 
                             <div style="margin: 10px;">