gluon-config-mode-geo-location-osm: OpenStreetMap-based location picker #1515

neocturne · 2018-08-19T19:57:26Z

This PR contains the revised version of the OpenStreetMap-based location picker for the config mode (#1484).

Changes:

Better integration with gluon-web
OpenLayers 5 (instead of 2)
Lots of changed strings (both package names and user-visible texts)
Extend gluon-config-mode-geo-location rather than replacing it (avoiding to build multiple variants of the same code)

The one big remaining issue is that OpenLayers 5.1.3 does not work with XHTML (or HTML5 delivered with application/xhtml+xml Content-Type). This has been fixed in openlayers/openlayers#8524, so I hope the next OpenLayers release will just work.

2tata · 2018-08-22T01:09:26Z

docs/user/site.rst

@@ -407,6 +407,13 @@ config_mode \: optional
    package. Set *geo_location.show_altitude* to *true* if you want the altitude
    field to be visible.

+    The *geo_location.osm* section is only relevant when the *gluoin-config-mode-geo-location-osm*


gluoin-config-mode-geo-location-osm -> gluon-config-mode-geo-location-osm

2tata · 2018-08-22T01:11:19Z

package/gluon-config-mode-geo-location-osm/check_site.lua

@@ -0,0 +1,4 @@
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lon'}))
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lat'}))


Maybe we can have default values like 0.0/0.0 to reduce site.conf parameters.

Certainly not. This is a value that must be provided by each site, 0.0/0.0 simply doesn't make sense.

2tata · 2018-08-22T20:33:55Z

package/gluon-config-mode-theme/sass/gluon.scss

@@ -284,6 +284,12 @@ code {
  margin-bottom: 2em;
 }

+.gluon-osm-map {
+  width: 100%;
+  height: 40em;


40em seems to much maybe 25 is better the map looks nicer.

The width of the main content scales between 40em and 60em (depending on the window width), meaning that with a height of 40em the map is square in narrow windows, and has a 3:2 aspect ratio in wide windows. This is already close to the usual widescreen display aspect ratio of 16:10.

Given that the relevant areas for sites should be circular on average, a square seems like the best approximation to me. Further decreasing the height would make the map less square, so we should either increase the height, or keep the current value...

neocturne · 2018-08-22T21:25:29Z

Screenshot:

rotanid · 2018-08-22T23:11:44Z

i think it's a nice solution.
btw., the fix to openlayers was merged.

2tata · 2018-08-22T23:19:41Z

...age/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua

+	if osm then
+		map = s:option(osm.MapValue, "map", osm.options(lon, lat))
+		map:depends(share_location, true)
+	end


It would be more clear if we put the 'share_location' checkbox below the map.

mweinelt · 2018-08-23T21:31:23Z

This would be an ideal basis for picking a domain, e.g. through boundary box overlays, like at https://darmstadt.freifunk.net/mitmachen/domains/.

2tata · 2018-08-24T12:29:00Z

@NeoRaider There seems a bug in thins code. If I have "Advertise node position" checked and had already select a position on the map. After Pressing "Save & restart" the configmode will be just reload but not completed. Only after I have unchecked "Advertise node position" I can apply the formula.

neocturne · 2018-08-24T17:12:29Z

Hmm, I will look into this.

neocturne · 2018-08-24T18:18:38Z

I fixed two issues in the code:

missing validate() override
map was not using the previously submitted lon/lat values when form was rejected because of unrelated validation failures

2tata · 2018-08-26T11:41:08Z

@NeoRaider I can confirm the bugfix. Now everything seems working as expected.

2tata · 2018-08-28T23:04:49Z

docs/user/site.rst

+    define the default center of the map when no position has been picked yet. The *zoom* level
+    defaults to 12 in this case. *openlayers_url* allows to override the base URL of the
+    *build/ol.js* and *css/ol.css* files (the default is
+    ``https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.1.3``).


url can be update to https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/build/ol.js
that contains your upstream fixes.

Can be used for inserting Lua values into inline JS code.

…pass them through

…, fix Form id

The new code is shorter and uses more readable variable names. It does not depend on specifically named input fields anymore (allowing to use multiple maps on the same page), and only uses well-defined interfaces to trigger revalidation of input fields. The Map model class allows to add OSM maps to gluon-web forms.

gluon-config-mode-geo-location-osm extends the gluon-config-mode-geo-location with a location picker based on OpenStreetMaps. Based-on-patch-by: Jan-Tarek Butt <tarek@ring0.de>

rubo77 · 2018-09-06T09:39:41Z

worth noting: the URL in the example from site.rst does not work. That is just an example from alpha centauri, if you are mirroring the javascript in your own domain.

docs/user/site.rst sais:

openlayers_url allows to override the base URL of the build/ol.js and css/ol.css files (the default is https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0).

neocturne added 0. type: enhancement The changeset is an enhancement 2. status: blocked Marked as blocked because it's waiting on something labels Aug 19, 2018

neocturne mentioned this pull request Aug 19, 2018

gluon-config-mode-geo-location-with-map: integrate a location picker map #1484

Closed

2 tasks

neocturne force-pushed the geo-location-osm branch 2 times, most recently from 50e6502 to a2913e1 Compare August 19, 2018 20:08

rotanid added this to the 2018.2 milestone Aug 20, 2018

neocturne force-pushed the geo-location-osm branch from a2913e1 to a749516 Compare August 21, 2018 19:50

2tata reviewed Aug 22, 2018

View reviewed changes

neocturne force-pushed the geo-location-osm branch from a749516 to b0cc8cf Compare August 22, 2018 18:14

2tata reviewed Aug 22, 2018

View reviewed changes

neocturne force-pushed the geo-location-osm branch from b0cc8cf to 05d816c Compare August 22, 2018 21:03

2tata reviewed Aug 22, 2018

View reviewed changes

neocturne force-pushed the geo-location-osm branch from 05d816c to 18c1d7e Compare August 23, 2018 21:03

neocturne force-pushed the geo-location-osm branch 2 times, most recently from 14822d7 to 3bd2078 Compare August 24, 2018 18:17

2tata reviewed Aug 28, 2018

View reviewed changes

neocturne added 7 commits September 1, 2018 11:28

gluon-web: add view helper for JSON-encoded values

a2be178

Can be used for inserting Lua values into inline JS code.

gluon-web-model: remove unused Section attribute "fields"

653c132

gluon-web-model: reorder Node arguments so Section:option() can just …

9a732f3

…pass them through

gluon-web-model, gluon-config-mode-theme: replace old gluon-map class…

a3a1d21

…, fix Form id

gluon-web-model: add custom events for form elements

ba1df47

gluon-config-mode-geo-location-osm: add OSM-based location picker

a8d736a

gluon-config-mode-geo-location-osm extends the gluon-config-mode-geo-location with a location picker based on OpenStreetMaps. Based-on-patch-by: Jan-Tarek Butt <tarek@ring0.de>

neocturne force-pushed the geo-location-osm branch from 3bd2078 to a8d736a Compare September 1, 2018 09:38

neocturne merged commit a8d736a into master Sep 1, 2018

neocturne deleted the geo-location-osm branch September 1, 2018 09:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gluon-config-mode-geo-location-osm: OpenStreetMap-based location picker #1515

gluon-config-mode-geo-location-osm: OpenStreetMap-based location picker #1515

neocturne commented Aug 19, 2018

2tata Aug 22, 2018

2tata Aug 22, 2018

neocturne Aug 22, 2018

2tata Aug 22, 2018

neocturne Aug 22, 2018

neocturne commented Aug 22, 2018

rotanid commented Aug 22, 2018

2tata Aug 22, 2018

mweinelt commented Aug 23, 2018 •

edited

Loading

2tata commented Aug 24, 2018

neocturne commented Aug 24, 2018

neocturne commented Aug 24, 2018

2tata commented Aug 26, 2018

2tata Aug 28, 2018

rubo77 commented Sep 6, 2018 •

edited

Loading

		@@ -0,0 +1,4 @@
		need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lon'}))
		need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lat'}))

gluon-config-mode-geo-location-osm: OpenStreetMap-based location picker #1515

gluon-config-mode-geo-location-osm: OpenStreetMap-based location picker #1515

Conversation

neocturne commented Aug 19, 2018

2tata Aug 22, 2018

Choose a reason for hiding this comment

2tata Aug 22, 2018

Choose a reason for hiding this comment

neocturne Aug 22, 2018

Choose a reason for hiding this comment

2tata Aug 22, 2018

Choose a reason for hiding this comment

neocturne Aug 22, 2018

Choose a reason for hiding this comment

neocturne commented Aug 22, 2018

rotanid commented Aug 22, 2018

2tata Aug 22, 2018

Choose a reason for hiding this comment

mweinelt commented Aug 23, 2018 • edited Loading

2tata commented Aug 24, 2018

neocturne commented Aug 24, 2018

neocturne commented Aug 24, 2018

2tata commented Aug 26, 2018

2tata Aug 28, 2018

Choose a reason for hiding this comment

rubo77 commented Sep 6, 2018 • edited Loading

mweinelt commented Aug 23, 2018 •

edited

Loading

rubo77 commented Sep 6, 2018 •

edited

Loading