Skip to content

O
OKU-GIS
Commit 268fa26e authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

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

parents d5ab8921 4eb0fc1f
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 32 deletions
static/js/action.js
View file @ 268fa26e
......@@ -1344,19 +1344,21 @@ mapss_p = L.tileLayer('https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&
minZoom: 4,
}).addTo(map_edit_p);
var mark_l = null
var mark_p = null
function modal_detail_point_pengaturan(id, db) {
$("#modal_detail_point_pengaturan").modal("show")
if (map_poin_det.hasLayer(marker)) {
marker.clearLayers()
marker.remove()
if (map_poin_det.hasLayer(mark_l)) {
// marker.clearLayers()
mark_l.remove()
}
if (map_edit_p.hasLayer(marker)) {
poinin.clearLayers()
poinin.remove()
if (map_edit_p.hasLayer(mark_p)) {
// poinin.clearLayers()
mark_p.remove()
}
$.ajax({
......@@ -1390,23 +1392,34 @@ function modal_detail_point_pengaturan(id, db) {
var marker = L.marker([data['result'][0][0]['geometry']['coordinates'][1], data['result'][0][0]['geometry']['coordinates'][0]]).addTo(map_poin_det);
map_poin_det.setView([data['result'][0][0]['geometry']['coordinates'][1], data['result'][0][0]['geometry']['coordinates'][0]], 17)
mark_l = marker
map_edit_p.setView([data['result'][0][0]['geometry']['coordinates'][1], data['result'][0][0]['geometry']['coordinates'][0]], 17);
let dapoin = [data['result'][0][0]['geometry']['coordinates'][1], data['result'][0][0]['geometry']['coordinates'][0]]
var poinin = L.marker(dapoin).addTo(map_edit_p)
mark_p = poinin
poinin.enableEdit();
$('#saveedit_p').click(function() {
var hasil = (JSON.stringify(poinin.toGeoJSON()))
$("#coordinateZoneedit_p").val(hasil);
})
$("#edit_point_p").click(function() {
setTimeout(function() {
map_edit_p.invalidateSize();
}, 1000);
})
}
});
}
$("#edit_point_p").click(function() {
$("#koordinat_cek_p").addClass("active")
$("#info_umum_p").removeClass("active")
$("#left-tab1-feas-upli").addClass("active")
$("#right-tab2-feas-upli").removeClass("active")
setTimeout(function() {
map_edit_p.invalidateSize();
}, 1000);
})
$("#saveuser").on("click", function() {
var isObject = {};
var ars = ''
......
static/js/scripts.js
View file @ 268fa26e
......@@ -90,13 +90,38 @@ $("#button_hide_panel").click(function() {
})
var cek_layer_keterangan = 1
var cek_layer_perbaikan = 0
$("#button_keterangan").click(function() {
$(".pace-done").toggleClass("sidebar-move")
$("#panel-samping").toggleClass("move");
$(".mymodal").toggleClass("input_perbaikan")
$("#button_unhide_panel").toggleClass("move-btn");
if (cek_layer_keterangan == 0){
// $("#button_keterangan").removeClass("asctive");
// $("#button_keterangan").removeAttr("class");
$(".pace-done").toggleClass("sidebar-move")
$("#panel-samping").toggleClass("move");
$(".mymodal").toggleClass("input_perbaikan")
$("#button_unhide_panel").toggleClass("move-btn");
$("#keterangan_button").css("background", "#353847")
$("#perbaikan_manage").css("background", "#1E2233")
cek_layer_keterangan = 1
cek_layer_perbaikan = 0
}else{
$("#button_keterangan").addClass("asctive");
$("#keterangan_button").css("background", "#1E2233")
$("#manage_perbaikan").removeClass("active");
$("#panel-sm").removeClass("active");
$("#panel-sm2").removeClass("active");
$("#panel-sm").css('display', 'none');
cek_layer_keterangan = 0
cek_layer_perbaikan = 0
}
})
$("#button_keterangan").addClass("active");
$("#button_unhide_panel").click(function() {
......@@ -108,13 +133,31 @@ $("#button_unhide_panel").click(function() {
$("#manage_perbaikan").click(function() {
$(".pace-done").toggleClass("sidebar-move");
$("#panel-samping").toggleClass("move");
$(".mymodal").toggleClass("input_perbaikan");
$("#button_unhide_panel").toggleClass("move-btn");
$("#perbaikan-dashboard").toggleClass("perbaikan-dashboard");
console.log('a')
if(cek_layer_perbaikan == 0){
console.log('b')
cek_layer_perbaikan = 1
cek_layer_keterangan = 0
$(".pace-done").toggleClass("sidebar-move");
$("#panel-samping").toggleClass("move");
$(".mymodal").toggleClass("input_perbaikan");
$("#button_unhide_panel").toggleClass("move-btn");
$("#panel-sm2").addClass("active");
$("#perbaikan_manage").css("background", "#353847")
$("#keterangan_button").css("background", "#1E2233")
$("#perbaikan-dashboard").toggleClass("perbaikan-dashboard");
}else{
console.log('c')
cek_layer_perbaikan = 0
cek_layer_keterangan = 0
$("#perbaikan_manage").css("background", "#1E2233")
$("#manage_perbaikan").addClass("active");
$("#panel-sm").removeClass("active");
$("#panel-sm2").removeClass("active");
$("#panel-sm").css('display', 'none');
}
})
......
static/js/scripts_js_m.js
View file @ 268fa26e
......@@ -11150,6 +11150,16 @@ map.on("movestart", function() {
geo_bangunan.clearLayers();
});
let cookieLat =$.cookie("lat");
let cookieLng =$.cookie("lng");
let cookieZoom =$.cookie("zoom");
if(cookieLat){
console.log(cookieLat);
map.setView([cookieLat, cookieLng], cookieZoom)
// map_result.setView([data.polbang[0][0][0][1], data.polbang[0][0][0][0]], 17);
}
map.on("moveend", function() {
var wetan = map.getBounds().getEast();
var kulon = map.getBounds().getWest();
......@@ -11159,6 +11169,10 @@ map.on("moveend", function() {
var zoom = map.getZoom();
var dist = measure(wetan, lor, kulon, kidul)
$.cookie('lat', center.lat)
$.cookie('lng', center.lng)
$.cookie('zoom', zoom)
var checkBox_building = document.getElementById("geo_building");
if (checkBox_building.checked == true) {
......@@ -11840,4 +11854,19 @@ function getdetailperbang(id) {
}
});
};
\ No newline at end of file
};
function tooltipOver(x){
$(".label-tooltip").html(x)
$(".label-tooltip").css("visibility", "visible")
}
function tooltipOut(x){
$(".label-tooltip").css("visibility", "hidden")
// $(".label-tooltip").val(x.val())
}
\ No newline at end of file
static/js/scripts_js_o.js
View file @ 268fa26e
......@@ -3774,6 +3774,13 @@ map.on('contextmenu', function(e) {
$(".btn_create_jalan").click(function() {
$("#tab_koor").addClass("active")
$("#tab_info").removeClass("active")
$("#koordinatjalan").addClass("active")
$("#informasi_create").removeClass("active")
$("#create_all > div > ul").css("display", "block")
$("#modal__create").modal("show");
$(".title-create").html("Create Jalan")
......@@ -3899,6 +3906,12 @@ map.on('contextmenu', function(e) {
})
$(".btn_create_bangunan").click(function() {
$("#tab_koor").addClass("active")
$("#tab_info").removeClass("active")
$("#koordinatjalan").addClass("active")
$("#informasi_create").removeClass("active")
$("#create_all > div > ul").css("display", "block")
$("#modal__create").modal("show");
$(".title-create").html("Create Bangunan")
......@@ -4179,6 +4192,12 @@ map.on('contextmenu', function(e) {
});
$(".btn_create_lahan").click(function() {
$("#tab_koor").addClass("active")
$("#tab_info").removeClass("active")
$("#koordinatjalan").addClass("active")
$("#informasi_create").removeClass("active")
$("#create_all > div > ul").css("display", "block")
$("#modal__create").modal("show");
$(".title-create").html("Create Lahan")
......@@ -4344,6 +4363,12 @@ map.on('contextmenu', function(e) {
});
$(".btn_create_point").click(function() {
$("#tab_koor").addClass("active")
$("#tab_info").removeClass("active")
$("#koordinatjalan").addClass("active")
$("#informasi_create").removeClass("active")
$("#modal__create").modal("show");
$(".title-create").html("Create Point")
$(".tombol_action_create").html(``)
......
static/js/scripts_layout.js
View file @ 268fa26e
......@@ -17,7 +17,9 @@ $('#search_spes li a').on('click', function() {
var res_in = null;
var res_id = null;
$('#input_search').on('input', function() {
var inp = $('#input_search').val()
console.log(inp)
$.ajax({
url: "api/search_spes",
......
templates/includes/modal.html
View file @ 268fa26e
......@@ -2313,7 +2313,7 @@
</div>
</div>
<div id="modal_detail_point_pengaturan" class="modal fade mymodal">
<div id="modal_detail_point_pengaturan" class="modal fade mymodal" style="z-index: 9999;">
<div class="modal-dialog modal-md" style="top: 10%;">
<div class="modal-content" style="border-radius:10px;">
<div class="modal-body" style="padding: 0px;">
......@@ -2427,7 +2427,7 @@
</div>
</div>
<div class="modal fade" id="modal_edit_p_point">
<div class="modal fade" id="modal_edit_p_point" style="z-index: 9999;">
<div class="modal-dialog md">
<div class="modal-content" style="border-radius:10px;">
<div class="modal-header bg-info" style=" border-top-left-radius: 10px;
......@@ -2441,8 +2441,8 @@
<div class="tabbable">
<ul class="nav nav-tabs nav-tabs-bottom nav-justified">
<li onclick="changetabs(this)" id="koordinat_cek" class="active"><a href="#left-tab1-feas-upli" data-toggle="tab">Koordinat</a></li>
<li onclick="changetabs(this)" id="info_umum"><a href="#right-tab2-feas-upli" data-toggle="tab">Informasi Umum</a></li>
<li onclick="changetabs(this)" id="koordinat_cek_p" class="active"><a href="#left-tab1-feas-upli" data-toggle="tab">Koordinat</a></li>
<li onclick="changetabs(this)" id="info_umum_p"><a href="#right-tab2-feas-upli" data-toggle="tab">Informasi Umum</a></li>
</ul>
<div class="tab-content">
......
templates/includes/plugin.html
View file @ 268fa26e
......@@ -51,7 +51,7 @@
<img src="{% static 'img/maps/mapbox.PNG' %}" alt="" style="min-width: 180px; max-height: 130px;
min-height: 130px">
<span class="menu-heading">
World Imagery</span>
MapBox Light</span>
</a>
</ul>
</div>
......
templates/includes/sidebar.html
View file @ 268fa26e
......@@ -8,6 +8,14 @@
margin-top: 20px;
border-bottom: 0.5pt solid #313649;
}
.label-tooltip{
position: absolute;
color: white;
z-index: 999;
background-color: #1B1F2D;
visibility: hidden;
}
</style>
<!-- <div class="navbar navbar-inverse" style="z-index: 1;
......@@ -29,13 +37,13 @@ background: none;border-color: transparent;">
<ul class="navigation navigation-main navigation-accordion" style="margin-bottom: 40vh;">
<!-- Main -->
<li id="button_keterangan">
<li id="button_keterangan" onmouseover="tooltipOver('Keterangan & POI')" onmouseout="tooltipOut('')" value="Keterangan & POI">
<a href="#panel-sm" data-toggle="tab" aria-expanded="false" class="side-bar-but" id="keterangan_button">
<i class="icon-stack2"></i>
</a>
</li>
{% if user.is_authenticated %}
<li id="manage_perbaikan">
<li id="manage_perbaikan" onmouseover="tooltipOver('Managemen Perbaikan')" onmouseout="tooltipOut('')">
<a href="#panel-sm2" data-toggle="tab" aria-expanded="false" class="side-bar-but" id="perbaikan_manage">
<i class="icon-pie-chart5"></i>
</a>
......@@ -50,13 +58,13 @@ background: none;border-color: transparent;">
<ul class="navigation navigation-main navigation-accordion" style="height: 100px;">
<li>
<li onmouseover="tooltipOver('Help & Support')" onmouseout="tooltipOut('')">
<a href="#" class="side-bar-but" data-toggle="modal" data-target="#modal_help" data-backdrop="static" data-keyboard="false">
<img src="{% static 'img/icon-1/Vectoriconwarning.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
</a>
</li>
{% if user.is_authenticated %}
<li>
<li onmouseover="tooltipOver('LOGOUT')" onmouseout="tooltipOut('')">
<a href="{% url 'logout' %}" class="side-bar-but">
<img src="{% static 'img/icon-1/Vectoriconlogout.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
</a>
......@@ -74,6 +82,10 @@ background: none;border-color: transparent;">
</div>
</div>
<div class="label-tooltip">
ghjkl
</div>
<div id="panel-sm" class="sidebar-2" style="display:block; background: #1B1F2D; position: absolute; z-index: 9; width:330px; height:100vh; left: 0%; transition: all 0.5s ease;">
<div style="margin-left: 50px;background: #1B1F2D;">
......
templates/layout/layout.html
View file @ 268fa26e
......@@ -69,6 +69,10 @@
.invisible-marker {
display: none;
}
table{
font-size: 14px!important;
}
/* end hide fitur modal */
</style>
......@@ -148,6 +152,7 @@
<div id="progress-bar"></div>
</div>
<div id="map">
<div style="position: absolute;z-index: 999;bottom: 0px;left: 0px;background: white;font-size: 14px;"> Klik kanan untuk create Bangunan, Jalan, Point, dsb </div>
<div class="help_bangunan" style="position: absolute;z-index: 999;top: 0px;right: 60px;"></div>
<div class="row" style="margin-top: 20px;">
......@@ -470,6 +475,7 @@
var res_id = null;
$('#input_search').on('input', function() {
var inp = $('#input_search').val()
console.log(inp)
$.ajax({
url: "{% url 'api:search_spes' %}",
......
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