Skip to content

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

jumat, 12/11/2021 

- ganti base
- default sidebar
- change search
- on all point
parent 86a6dff1
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 22 deletions
static/js/maps.js
View file @ dde957c3
...@@ -58,9 +58,13 @@ OpenStreetMap.onclick = function() { ...@@ -58,9 +58,13 @@ OpenStreetMap.onclick = function() {
WorldImagery.onclick = function() { WorldImagery.onclick = function() {
map.removeLayer(maps) map.removeLayer(maps)
// https://{s}.tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png // https://{s}.tiles.wmflabs.org/osm-no-labels/{z}/{x}/{y}.png
maps = L.tileLayer("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", { // maps = L.tileLayer("https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", {
maxZoom: 22, // maxZoom: 22,
minZoom: 3, // minZoom: 3,
// }).addTo(map);
maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
id: 'mapbox/light-v9',
tileSize: 512, zoomOffset: -1
}).addTo(map); }).addTo(map);
}; };
......
templates/includes/js-m.html
View file @ dde957c3
...@@ -2863,6 +2863,21 @@ ...@@ -2863,6 +2863,21 @@
var marker = L.marker(latlng, { var marker = L.marker(latlng, {
icon: smallIcon icon: smallIcon
}); });
// conte = `
// <div id="bottom-justified-data" style="text-align: center;">
// <div style="font-family: Google Sans,Roboto,Arial,sans-serif;
// letter-spacing: 0">
// <p>
// ` + feature.administrasi.f1 + `
// </p>
// </div>
// </div>
// `;
// marker.bindPopup(conte,{
// closeOnClick: false,
// maxWidth: 100,
// permanent: true
// });
conten = ` conten = `
<div id="bottom-justified-data" style="text-align: center;"> <div id="bottom-justified-data" style="text-align: center;">
<div > <div >
...@@ -2889,6 +2904,7 @@ ...@@ -2889,6 +2904,7 @@
} }
}, },
onEachFeature: function(feature, layer) { onEachFeature: function(feature, layer) {
layer.on({ layer.on({
click: function(e) { click: function(e) {
$("#modal_detail_non_kelurahan").modal('show'); $("#modal_detail_non_kelurahan").modal('show');
...@@ -6552,6 +6568,9 @@ ...@@ -6552,6 +6568,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -6677,6 +6696,9 @@ ...@@ -6677,6 +6696,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -6802,6 +6824,9 @@ ...@@ -6802,6 +6824,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -6927,6 +6952,9 @@ ...@@ -6927,6 +6952,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7052,6 +7080,9 @@ ...@@ -7052,6 +7080,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7177,6 +7208,9 @@ ...@@ -7177,6 +7208,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7377,6 +7411,9 @@ ...@@ -7377,6 +7411,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7502,6 +7539,9 @@ ...@@ -7502,6 +7539,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7627,6 +7667,9 @@ ...@@ -7627,6 +7667,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
...@@ -7752,6 +7795,9 @@ ...@@ -7752,6 +7795,9 @@
</div> </div>
`); `);
$(".btn_action").html(`
`)
content = `<table class="table table-hover tasks-list"> content = `<table class="table table-hover tasks-list">
<thead style="text-align: center;"> <thead style="text-align: center;">
<tr> <tr>
......
templates/includes/plugin.html
View file @ dde957c3
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="col-md-3"> <div class="col-md-3">
<ul class="menu-list"> <ul class="menu-list">
<a href="#" data-toggle="collapse" data-target=".navbar-collapse.in" id="WorldImagery"> <a href="#" data-toggle="collapse" data-target=".navbar-collapse.in" id="WorldImagery">
<img src="{% static 'img/maps/esri.PNG' %}" alt="" style="min-width: 180px; max-height: 130px; <img src="{% static 'img/maps/mapbox.PNG' %}" alt="" style="min-width: 180px; max-height: 130px;
min-height: 130px"> min-height: 130px">
<span class="menu-heading"> <span class="menu-heading">
World Imagery</span> World Imagery</span>
......
templates/includes/sidebar.html
View file @ dde957c3
...@@ -101,7 +101,7 @@ background: none;border-color: transparent;"> ...@@ -101,7 +101,7 @@ background: none;border-color: transparent;">
</div> </div>
<div class="col-sm-9" style="margin-bottom: 2px;margin-top: -8px;"> <div class="col-sm-9" style="margin-bottom: 2px;margin-top: -8px;">
Luas Wilayah <br> Luas Wilayah <br>
<b>{{ global.1 }} Km2</b> <b>{{ global.1|intcomma }} Km2</b>
</div> </div>
</div> </div>
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white"> <div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white">
...@@ -183,21 +183,6 @@ background: none;border-color: transparent;"> ...@@ -183,21 +183,6 @@ background: none;border-color: transparent;">
</div> </div>
</div> </div>
<div class="tab-pane" id="bottom-tab2"> <div class="tab-pane" id="bottom-tab2">
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white">
<!-- <div class="col-sm-1"></div> -->
<div class="col-sm-5">
<!-- <img src="{% static 'img/icon-1/Buildings.svg' %}" alt=""> -->
</div>
<div class="col-sm-2" style="margin-top: -2px!important;">
<div class="checkbox checkbox-switchery">
<label>
<input type="checkbox" class="switchery-custom" id="po_all" onclick="gas_all()">
</label>
</div>
</div>
<div class="col-sm-5" style="margin-bottom: 2px;margin-top: -8px;">
</div>
</div>
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white"> <div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white">
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
<div class="col-sm-2"> <div class="col-sm-2">
...@@ -407,7 +392,21 @@ background: none;border-color: transparent;"> ...@@ -407,7 +392,21 @@ background: none;border-color: transparent;">
</label> </label>
</div> </div>
</div> </div>
</div>
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white;margin-top:7px;">
<!-- <div class="col-sm-1"></div> -->
<div class="col-sm-5">
<!-- <img src="{% static 'img/icon-1/Buildings.svg' %}" alt=""> -->
</div>
<div class="col-sm-2" style="margin-top: -2px!important;">
<div class="checkbox checkbox-switchery">
<label>
<input type="checkbox" class="switchery-custom" id="po_all" onclick="gas_all()">
</label>
</div>
</div>
<div class="col-sm-5" style="margin-bottom: 2px;margin-top: -8px;">
</div>
</div> </div>
<!-- <div class="checkbox checkbox-switchery"> <!-- <div class="checkbox checkbox-switchery">
......
templates/layout/layout.html
View file @ dde957c3
...@@ -632,7 +632,7 @@ ...@@ -632,7 +632,7 @@
</div> </div>
`; `;
marker.bindTooltip(conten, { marker.bindTooltip(conten, {
permanent: false, permanent: true,
className: "my-label", className: "my-label",
direction: 'top', direction: 'top',
offset: [0, -25] offset: [0, -25]
......
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