Merge pull request #1 from fisuda/hardening/features

OpenLayers Map ja Widget v1.0.0
lets-fiware · May 16, 2021 · 5961e72 · 5961e72
2 parents 084fc09 + d15ceed
commit 5961e72
Show file tree

Hide file tree

Showing 8 changed files with 879 additions and 14 deletions.
diff --git a/src/config.xml b/src/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="FISUDA" name="ol-map-ja" version="1.2.4b1">
+<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="FISUDA" name="ol-map-ja" version="1.0.0">
     <details>
-        <title>OpenLayers Map</title>
+        <title>OpenLayers Map ja</title>
         <email>[email protected]</email>
         <homepage>https://github.com/lets-fiware/ol-map-ja-widget</homepage>
         <image>images/catalogue.png</image>
@@ -20,12 +20,100 @@
     </requirements>
 
     <preferences>
-        <preference name="initialCenter" type="text" label="Initial Location" description="Decimal coordinates where map will be centered on load (e.g. `52, 5`). Leave this setting empty if you don't want to center the map at init. Remember to change the initial zoom level if you provide an initial location." default="" />
-        <preference name="initialZoom" type="text" label="Initial Zoom Level" description="Initial zoom level. From 1 to 22, where '1' represents the furthest level and '22' the maximum zoom level." default="3" />
-        <preference name="minzoom" label="Min Zoom" type="text" description="" default="4" />
-        <preference name="poiZoom" label="PoI Zoom" type="text" description="Zoom level applied when centering a PoI" default="17" />
-        <preference name="layerswidget" label="Layers Widget" type="text" description="Widget to use for allowing user to switch between layers" default="" />
-        <preference name="useclustering" label="Use Clustering" type="boolean" description="Mark this option to use clustering for displaying map features" default="false" />
+        <preference
+            name="initialCenter"
+            type="text"
+            label="Initial Location"
+            description="Decimal coordinates where map will be centered on load (e.g. `52, 5`). Leave this setting empty if you don't want to center the map at init. Remember to change the initial zoom level if you provide an initial location."
+            default="135,35"
+        />
+        <preference
+            name="initialZoom"
+            type="text"
+            label="Initial Zoom Level"
+            description="Initial zoom level. From 1 to 22, where '1' represents the furthest level and '22' the maximum zoom level."
+            default="6"
+        />
+        <preference
+            name="minzoom"
+            label="Min Zoom"
+            type="text"
+            description=""
+            default="4"
+        />
+        <preference
+            name="poiZoom"
+            label="PoI Zoom"
+            type="text"
+            description="Zoom level applied when centering a PoI"
+            default="17"
+        />
+        <preference
+            name="layerswidget"
+            label="Layers Widget"
+            type="text"
+            description="Widget to use for allowing user to switch between layers"
+            default=""
+        />
+        <preference name="maptype" label="Map Type" type="list" description="Map Type" default="OSM">
+            <option label="Open Street Map" value="OSM"/>
+            <option label="CartDB Light" value="CARTODB_LIGHT"/>
+            <option label="地理院 標準地図" value="GSI_STD"/>
+            <option label="地理院 淡色地図" value="GSI_PALE"/>
+            <option label="地理院 English" value="GSI_ENG"/>
+            <option label="地理院 白地図" value="GSI_BLANK"/>
+            <option label="地理院 写真" value="GSI_PHOTO"/>
+            <option label="地理院 色別標高図" value="GSI_RELIEF"/>
+            <option label="地理院 活断層図" value="GSI_AFM"/>
+        </preference>
+        <preference name="layer_swipe" label="Layer Swipe" description="map for swipe" type="list" default="Off">
+            <option label="Off" value="Off"/>
+            <option label="Open Street Map" value="OSM"/>
+            <option label="CartDB Light" value="CARTODB_LIGHT"/>
+            <option label="地理院 標準地図" value="GSI_STD"/>
+            <option label="地理院 淡色地図" value="GSI_PALE"/>
+            <option label="地理院 English" value="GSI_ENG"/>
+            <option label="地理院 白地図" value="GSI_BLANK"/>
+            <option label="地理院 写真" value="GSI_PHOTO"/>
+            <option label="地理院 色別標高図" value="GSI_RELIEF"/>
+            <option label="地理院 活断層図" value="GSI_AFM"/>
+            <option label="洪水浸水想定区域(想定最大規模)" value="GSI_SHINSUISHIN"/>
+            <option label="洪水浸水想定区域(想定最大規模)_国管理河川" value="GSI_SHINSUISHIN_KUNI"/>
+            <option label="津波浸水想定" value="GSI_TSUNAMI"/>
+            <option label="土砂災害警戒区域(土石流)" value="GSI_DOSEKIRYUKEIKAIKUIKI"/>
+            <option label="土砂災害警戒区域(急傾斜地の崩壊)" value="GSI_KYUKEISHAKEIKAIKUIKI"/>
+            <option label="土砂災害警戒区域(地滑り)" value="GSI_JISUBERIKEIKAIKUIKI"/>
+            <option label="土石流危険渓流" value="GSI_DOSEKIRYUKIKENKEIRYU"/>
+            <option label="急傾斜地崩壊危険箇所" value="GSI_KYUKEISYACHIHOUKAI"/>
+        </preference>
+        <preference
+            name="swipe_value"
+            label="Swipe value"
+            description="Swipe value"
+            type="number"
+            default="50"
+        />
+        <preference
+            name="overview"
+            label="Overview"
+            type="boolean"
+            description="Overview Map"
+            default="false"
+        />
+        <preference
+            name="scaleline"
+            label="Scaleline"
+            type="boolean"
+            description="Scaleline"
+            default="false"
+        />
+        <preference
+            name="useclustering"
+            label="Use Clustering"
+            type="boolean"
+            description="Mark this option to use clustering for displaying map features"
+            default="false"
+        />
     </preferences>
 
     <wiring>

diff --git a/src/css/styles.css b/src/css/styles.css
@@ -14,3 +14,9 @@ body, html, .map {
     justify-content: center;
     align-items: center;
 }
+
+#swipe {
+    position: absolute;
+    bottom: 40px;
+    width 90%;
+}
diff --git a/src/doc/changelog.md b/src/doc/changelog.md
@@ -1,3 +1,21 @@
+## v1.0.0 (2021-05-16)
+
+- ol map ja v1.0.0
+- Add Japan GSI map feature
+- Add overview map feature
+- Add scale line feature
+- Add swipe feature
+- Add heatmap layer
+- Add heatmap KML layer
+- Add removePoI feature
+- Add feature for building marker with Font Awesome icon
+- Add custom style option with image or text
+- Add initial location value and initial zoom Level value
+
+NOTE: This WireCloud widget is based on Wirecloud/ol3-map-widget created by
+CoNWeT Lab., Universidad Politecnica de Madrid and Future Internet Consulting
+and Development Solutions S.L..
+
 ## v1.2.3 (2021-03-25)
 
 - Fix some problems rendering the layer/setcenter buttons

diff --git a/src/doc/userguide.md b/src/doc/userguide.md
@@ -78,6 +78,22 @@ Map viewer widget using OpenLayers. It can receive Layers or Point of Interest d
         - `opacity`: Opacity of the icon (range from 0 to 1). Default is `1`.
         - `scale`: Scale. Default is `1`.
         - `src`: Image source URI.
+        - `fontawesome`: Options of the Font Awesome icon to use for the marker.
+          Supported options:
+            - `glyph`: a glyph of the icon. Default is `fa-star`.
+            - `form`: icon form (icon, circle, box, marker). Default is
+              `marker`.
+            - `size`: pixel size of the icon. Default is `16` px.
+            - `color`: icon color. Default is same as the stroke color. CSS3
+              color, that is, an hexadecimal, `rgb` or `rgba` color. Default is
+              `white`.
+            - `fill`: fill color. CSS3 color, that is, an hexadecimal, `rgb` or
+            `rgba` color. Default is `blue`.
+            - `stroke`: stroke color. CSS3 color, that is, an hexadecimal, `rgb`
+              or `rgba` color. Default is `white`.
+            - `strokeWidth`: width of stroke. Default is `3`.
+            - `radius`: radius of marker.
+            - `margin`: margin between icon and marker.
     - `iconHighlighted`: icon configuration to use when the PoI is selected.
         Works in the same way than the `icon` field.
     - `infoWindow`: content (using HTML) associated with the PoI.

diff --git a/src/images/catalogue.png b/src/images/catalogue.png
diff --git a/src/index.html b/src/index.html
@@ -17,6 +17,7 @@
                 <div id="setcenterzoom-button" class="se-btn hidden" title="Set initial location and zoom level"><i class="fa-fw fas fa-expand"></i></div>
             </div>
         </div>
+        <input id="swipe" class="hidden" type="range" style="width: 99%" value="100">
     </body>
     <script type="text/javascript" src="js/ol3-map-widget.js"></script>
     <script type="text/javascript" src="js/main.js"></script>