push compress

12c741c6 · Manggar Mahardhika · bde81e96 · 12c741c6 · 12c741c6 · 12c741c6
Commit 12c741c6 authored Dec 20, 2021 by Manggar Mahardhika
30 changed files
--- a/Application/__pycache__/views.cpython-36.pyc
+++ b/Application/__pycache__/views.cpython-36.pyc
--- a/OKU/__pycache__/settings.cpython-36.pyc
+++ b/OKU/__pycache__/settings.cpython-36.pyc
--- a/OKU/settings.py
+++ b/OKU/settings.py
@@ -85,10 +85,10 @@ DATABASES = {
        'NAME': 'oku_gis_new',
        'USER': 'postgres',
        'PASSWORD' : 'khansia215758',
-        # 'HOST': '30.10.20.102',
-        # 'PORT': '5432',
-        'HOST': '103.126.28.66',
-        'PORT': '8082',
+        'HOST': '30.10.20.102',
+        'PORT': '5432',
+        # 'HOST': '103.126.28.66',
+        # 'PORT': '8082',
        # 'HOST': '103.126.28.66',
        # 'PORT': '5432',  
    }

--- a/myauth/__pycache__/views.cpython-36.pyc
+++ b/myauth/__pycache__/views.cpython-36.pyc
--- a/static/img/icon-1/Screen_shot_data_perbaikan.png
+++ b/static/img/icon-1/Screen_shot_data_perbaikan.png
--- a/static/img/icon-1/Screenshot_dash_poi.png
+++ b/static/img/icon-1/Screenshot_dash_poi.png
--- a/static/img/icon-1/Screenshot_detail_point.png
+++ b/static/img/icon-1/Screenshot_detail_point.png
--- a/static/img/icon-1/Screenshot_point_of_interest.png
+++ b/static/img/icon-1/Screenshot_point_of_interest.png
--- a/static/img/icon-1/bg1.png
+++ b/static/img/icon-1/bg1.png
--- a/static/img/icon-1/photo_2021-10-22_16-46-16.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-16.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-21.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-21.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-27.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-27.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-34.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-34.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-40.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-40.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-46.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-46.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-50.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-50.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-46-56.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-46-56.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-47-03.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-47-03.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-47-07.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-47-07.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-47-11.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-47-11.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-47-18.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-47-18.jpg
--- a/static/img/icon-1/photo_2021-10-22_16-47-23.jpg
+++ b/static/img/icon-1/photo_2021-10-22_16-47-23.jpg
--- a/static/img/image_null.png
+++ b/static/img/image_null.png
--- a/static/img/logo-ok.png
+++ b/static/img/logo-ok.png
--- a/static/img/maps/bing.PNG
+++ b/static/img/maps/bing.PNG
--- a/static/img/maps/esri.PNG
+++ b/static/img/maps/esri.PNG
--- a/static/img/maps/mapbox.png
+++ b/static/img/maps/mapbox.png
--- a/static/img/maps/osm.PNG
+++ b/static/img/maps/osm.PNG
--- a/templates/includes/js-m.html
+++ b/templates/includes/js-m.html
@@ -5803,24 +5803,11 @@

    // var map_cesium = new Cesium.Viewer('map-cesium');

-    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
-    });
-
-    //function mapsganti() {
-    //    $("#modalsearch3d").modal()
-    //}
-
-
    function mapsganti() {
+        // $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js', function() {
+            
+        // });
+        // $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js');
        var checkBox_3d = document.getElementById("mapschange");
        if (checkBox_3d.checked == true) {
            $("#modalsearch3d").modal()
@@ -5867,8 +5854,25 @@
        }
    }

+    //function mapsganti() {
+    //    $("#modalsearch3d").modal()
+    //}
+

    $("#search3D").click(function() {
+        // $.getScript('/static/Cesium-185/Build/Cesium/Cesium.js');
+        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
+        });
+
        $("#map").css('display', 'none');
        $("#map-cesium").css('display', 'block');
        $(".no3d").css('display', 'none');

--- a/templates/layout/layout_tess.html
+++ b/templates/layout/layout_tess.html
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+</head>
+
+
+<body>
+    tessssss
+</body>
+
+</html>
\ No newline at end of file