diff --git a/index.html b/index.html
index fa78e7e..1f82b3f 100755
--- a/index.html
+++ b/index.html
@@ -70,8 +70,8 @@
PLATEAU OSMデータ
-
+
diff --git a/index.json b/index.json
index a1009be..f37bb7f 100644
--- a/index.json
+++ b/index.json
@@ -1,5 +1,6 @@
{
"site":"https://surveyor.mydns.jp/osm-data/",
+"tasksite":"https://surveyor.mydns.jp/task-bldg/",
"list": [
{"code":"01100", "name":"北海道 札幌市", "path":"01100_sapporo-shi_2020", "coordinates":[141.35477,43.06172]},
{"code":"01205", "name":"北海道 室蘭市", "path":"01205_muroran-shi_2022", "coordinates":[140.987377,42.358417]},
diff --git a/index2.html b/index2.html
index 646c6e3..6947f0b 100755
--- a/index2.html
+++ b/index2.html
@@ -3,15 +3,15 @@
- PLATEAU DATA
+ PLATEAU-OSM 自治体別
-
@@ -63,7 +69,10 @@
diff --git a/index2.js b/index2.js
index a0b788f..85e7dad 100755
--- a/index2.js
+++ b/index2.js
@@ -9,6 +9,8 @@
var name = "";
var lonlat = [139.7637,35.6808];
+var table2str = "";
+
var queryString = window.location.search;
if(queryString){
queryString = queryString.substring(1);
@@ -39,6 +41,7 @@
$.getJSON("index.json")
).done(function(data1) {
site = data1.site;
+ taskSite = data1.tasksite;
style = new ol.style.Style({
image: new ol.style.Icon({
src: 'lib/img/osm_200x200.png',
@@ -95,6 +98,20 @@
geometry: new ol.geom.Point(ol.proj.fromLonLat(this.geometry.coordinates))
});
feature.information = this;
+ if (feature.information.properties != null) {
+ var prop = feature.information.properties;
+ table2str += "";
+ if (prop.id == null) {
+ table2str += " | ";
+ }
+ else {
+ table2str += "" + prop.id +" | ";
+ }
+ table2str += "" + prop.path + " | ";
+ table2str = table2str + "" + prop.version+ " | ";
+ table2str = table2str + "" + prop.surveyYear+ " | ";
+ table2str = table2str + "
";
+ }
feature.setStyle(style);
__markerLayer.getSource().addFeature(feature);
}
@@ -103,6 +120,8 @@
}
}
});
+ var table2 = document.getElementById("table2");
+ table2.innerHTML = "id | path | '1st' version | survey year |
"+ table2str +"
";
// 地図のクリックイベントを設定
__map.on('click', function (evt) {
@@ -119,7 +138,7 @@
var descriptionHTML =
"code: " + info.properties.id + "
" +
"version: " + info.properties.version + "
" +
- "";
+ "";
element.innerHTML = descriptionHTML;
__overlay.setPosition(coordinates);
__map.addOverlay(__overlay);