[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] Map fixes and updates for cartograf for tiki 30+

Jonny Bradley pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
3702a504 by Jonny Bradley at 2026-08-25T11:21:36+00:00
Map fixes and updates for cartograf for tiki 30+
---
* [FIX] maps: Fix $mapBootstrapPopoverDummy being null when `popupStyle==="dialog"` (still a few issues with disposal in `popup` mode... FIXME)

* map fixes and updates for upgrading cartograf to tiki 30+
---
* Revert "[MOD] build: Add a filtered watch function to speed up js development - reduces build time from about 10s to 2s (n.b. TODO should be a separate MR)"

This reverts commit c9a7e2340b6c4ca3e715363c281da64db089b075.

* [FIX] maps: eslinting

* [FIX] maps: Slightly better popups and support for non tracker items (like users)

* [REF] maps: eslint

* [FIX] maps: Fix the popup/bubble popup style (mostly, still an initialisation error on loading sometimes)
Also make separate dummy elements for tooltips and popovers as they need ot be different now

* [FIX] maps: Var `features` wasn't declared for geo_file features, also replace a couple more jQuery loops

* [FIX] maps: ALlow spaces in coordinate strings, e.g. the center param in plugin map

* [ENH] maps: Add an include in cluster param to plugin map, the opposeite of the exclude one. If not set (in the tracker) then all items are included

* [FIX] maps: Continued mixups in coordinate transformation when editing tracker items specifically - does this do it?

* [FIX] maps: Fix base layer selection dropdown and use the ol-layer-switcher to change the visible layer to avoid duplicating the (complicated) logic.
Element Plus needs values to be different (of course!)

* [MOD] build: Add a filtered watch function to speed up js development - reduces build time from about 10s to 2s (n.b. TODO should be a separate MR)
Also some reformatting that i can't seem to stop currently

* [FIX] maps: Make other appframe anchors hide when one shows

* [ENH] maps: Add support for Stadia Maps, also json and xyz tilesets (work in progress, authentication needed)

* [REF] maps: Better name for getFeatureStyle and check length on `feature.get("features")``

* [FIX] maps: Update feature selection style, still more to do but better than it was

* [FIX] modals: Further fix for modal titles to let `options.title` override the one supplied in the template from the back end service

* [FIX] maps: Correct transform of lonlat coordinates for markers

* [ENH] maps: Improve clustering geometry

* [ENH] maps: Add a way of excluding some features from clustering. Useful for boundaries and rivers which can intentionally overlap other features.

* [FIX] maps: Rework the cluster size algorithm to work better with different shape types - rivers might still be an issue...

* [REF] maps: Refactor $(container).data("cluster")

* [FIX] maps: Oops, return the style from `setFeatureColorStyle` always

* [FIX] maps: `setFeatureColorStyle` needs a wrapper to stop the resolution param from the layer style callback being interpreted as a colour

* [FIX] maps: Forgot lines in the geomertyFunation, and modernise the loops in calculateClusterInfo fn

* [FIX] maps: Make sure the selection marker is removed after adding a new POI

* [FIX] maps: Experimental DblClickDragZoom added in error, and some eslinting

* [FIX] maps: Fix redrawing the map in a modal, e.g. in a tracker item edit form

* [FIX] maps: container.showPopup not always there

* [FIX] maps: Finally fix the select pin on basic maps e.g. on tracker Location fields.
Also fix the zoom setting change updating the input field

* [FIX][ENH] maps: Make clustering work with shapes and markers at the same time, and fix shape editing to use the shape layer
Needs testing when not clustering... (amongst other things)

* [REF] maps: Remove wrappers for setFeatureColorStyle which was making untangling the cluster styles even more confusing
Seems to only be used for shapes, markers use their own style setting fns

* [FIX] maps: Only make shapes layer if clustering

* [FIX] maps: Make shapes (Polygons and LineStrings) use separate layer when clustering, so we can cheat the cluster limitation of `ol.source.Cluster` only working with Points by default (as of ol10)

* [REF] maps: Extra semicolon

* [REF] maps: WIP on making cluster layers work with shapes as well as points - more to do...

* [REF] maps: Rename the 2nd `getLayer` fn

* [REF] maps: More refactoring trying to reduce the number of places feature styles get generated and set - trying to work out why `geo_features` disappear when clustering is enabled...

* [FIX] maps: Encode single quotes in geo_feature values to prevent them being truncated

* [FIX] maps: Refactoring error from last change

* [FIX] geolocation: Geographic Feature fields weren't getting `geo_located` set to 'y' and more

* [REF] maps: Finally time to convert to ES6 syntax more fully. Oddly had to make a few scope changes to fix some issues.
No doubt more to come... zones not showing any more (maybe more lost to the git mess)

* [FIX] modals: Prevent whitespace from wiping out modal titles (lost in rebase mess)
Take 3, got this wrong in d62a6923, oops

* [FIX] maps: Add back missing blank layer

* [FIX] trackers: Fix location when creating new maps with mod-tracker_input

* [FIX] element+: Fix for this coming in !10257 (hopefully)

* [FIX] theme: Revert b57be30a (and 33c3e737) as it no longer seems needed and makes things worse (odd)

* [FIX] Missed an ol3 reference (again)

* [FIX] theme: Set container width to 100% for non-fixed-width layouts (`auto` isn't necessarily full width, e.g. in cartograf)
Again

* [FIX] maps: Don't load already loaded features (possibly need to check locations etc too) and other fixes lost in git-mess

* [FIX] modals: Prevent whitespace from wiping out modal titles (lost in rebase mess)

* [FIX] maps: Finally creating POIs, Zones and Paths now working again!
Modernize event handling, interaction setup, and field updates.
Includes reverting some modeManager "inconsistencies" changed in 4cdcdb9d

* [MOD] maps: Work in progress on layer selector module to ol10 (is totally borken) - more to do but need to push...

* [MOD] maps: Rename tiki-maps-ol3.js to tiki-maps.js at last (also add a slight delay to the `initialized` event trigger as costom code was often missing it)

* [FIX] maps: First steps in getting OpenLayers editing controls working for ol version 10

* [FIX] maps: Stray trailing semicolon causing js issues with map item editing

* [FIX] maps: Finally creating POIs, Zones and Paths now working again!
Modernize event handling, interaction setup, and field updates.
Includes reverting some modeManager "inconsistencies" changed in 4cdcdb9d

* [MOD] maps: Work in progress on layer selector module to ol10 (is totally borken) - more to do but need to push...

* [MOD] maps: Rename tiki-maps-ol3.js to tiki-maps.js at last (also add a slight delay to the `initialized` event trigger as costom code was often missing it)

* [FIX] maps: First steps in getting OpenLayers editing controls working for ol version 10

* [FIX] maps: Stray trailing semicolon causing js issues with map item editing

* [FIX] maps: Finally creating POIs, Zones and Paths now working again!
Modernize event handling, interaction setup, and field updates.
Includes reverting some modeManager "inconsistencies" changed in 4cdcdb9d

* [MOD] maps: Work in progress on layer selector module to ol10 (is totally borken) - more to do but need to push...

* [MOD] maps: Rename tiki-maps-ol3.js to tiki-maps.js at last (also add a slight delay to the `initialized` event trigger as costom code was often missing it)

* [FIX] maps: First steps in getting OpenLayers editing controls working for ol version 10

* [FIX] maps: Stray trailing semicolon causing js issues with map item editing

* [FIX] maps: Don't load already loaded features (possibly need to check locations etc too)

* [FIX] maps: Modified feature might be in a feature group

* [REF] maps: Rename i to item in the feature loading loop

* [FIX] maps: Better icon alignment for markers (why is this in 3 places?)

* [REF] Leftover from file renaming

* [FIX] maps: Zoom level should be an integer

* [FIX] maps: Fix getMapCenter (TODO: the transform should be refactored one day)

* [FIX] maps: One last mode name vs id mixup reverted

* [FIX] maps: Finally creating POIs, Zones and Paths now working again!
Modernize event handling, interaction setup, and field updates.
Includes reverting some modeManager "inconsistencies" changed in 4cdcdb9d

* [FIX] maps: eslint (according to step 9, even though i haven't finished testing some of this yet...)

* [FIX] maps: Rationalise the modeManager and resolve (my) confusion between `mode` and `name` (and `title`) which seem to have become muddled over the years

* [FIX] maps: Mainly modernise the colorPicker code and make it work with cartograf feature editing tools - work in progress still

* [FIX] maps: Update `formatLocation` (so it might work?)

* [FIX] maps: Fix layer selector select, even though Element Plus prevents this from working so far... (sometimes tiki...!)

* [FIX] maps: Fix edit links on info popups

* [FIX] maps: Improve infobox popup modals and stop duplicated content

* [FIX] maps: Fix and rebind the modify feature event handlers for ol10 (could be cleaner, but at least working now)

* [FIX] maps: Modernise some of the `$.each` loops etc in tiki-maps.js

* [FIX] maps: First part of fixing evewnt handling for ol10 - select intersaction and coordinates now working again

* [FIX] maps: If a layer doesn't have a prefix or suffix (i.e. a shared layer from someone else's map) then leave it blank so the Editable layer is used

* [FIX] maps: Straighten out the mess i made with layers and layer groups, hopefully - fixes the custom layer selector module for cartograf

* [MOD] maps: Work in progress on layer selector module to ol10 (is totally borken) - more to do but need to push...

* [MOD] maps: Rename tiki-maps-ol3.js to tiki-maps.js at last (also add a slight delay to the `initialized` event trigger as costom code was often missing it)

* [FIX] js: A couple of js errors

* [FIX] maps: First steps in getting OpenLayers editing controls working for ol version 10

* [FIX] maps: Stray trailing semicolon causing js issues with map item editing

* [FIX] maps: One last mode name vs id mixup reverted

* [FIX] maps: Finally creating POIs, Zones and Paths now working again!
Modernize event handling, interaction setup, and field updates.
Includes reverting some modeManager "inconsistencies" changed in 4cdcdb9d

* [FIX] maps: eslint (according to step

See merge request tikiwiki/tiki!10804

- - - - -


15 changed files:

- lib/core/Search/GlobalSource/Geolocation.php
- lib/core/Tracker/Field/GeographicFeature.php
- lib/geo/geolib.php
- lib/headerlib.php
- lib/jquery_tiki/tiki-jquery.js
- lib/wiki-plugins/wikiplugin_appframe.php
- lib/wiki-plugins/wikiplugin_map.php
- path_js_importmap_generator.php
- − src/js/jquery-tiki/tiki-maps-ol3.js
- + src/js/jquery-tiki/tiki-maps.js
- templates/modules/mod-map_edit_features.tpl
- templates/modules/mod-map_layer_selector.tpl
- templates/modules/mod-tracker_input.tpl
- templates/wiki-plugins/wikiplugin_appframe_mapcontrol.tpl
- themes/base_files/scss/_tiki-bootstrap_overrides.scss


The diff was not included because it is too large.


View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3702a50478b2a00d8485207accdbb964774d5673

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/3702a50478b2a00d8485207accdbb964774d5673
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs