Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a default projection (OSMTILE) for the map #873

Merged
merged 62 commits into from
Sep 26, 2023
Merged

Add a default projection (OSMTILE) for the map #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f8e98c0
Add default projection (OSMTILE) + remove use of 'createmap' events
AliyanH Jul 7, 2023
1a7f57e
Rename _processInitialExtent to _processContent. Make a few anonymous
prushforth Jul 20, 2023
5a6c4c2
Get rid of resetTemplatedLayers, which was a hold-over from the
prushforth Jul 20, 2023
3ced6e7
Refactor: MapMLLayer._extent -> MapMLLayer._properties
prushforth Jul 20, 2023
58088f3
Add promise handling of top-level _layer initialization
Jul 24, 2023
87ddcae
update tests to incorporate the load times with the use of the promis…
AliyanH Jul 28, 2023
358a540
Rename getLayerExtentHTML to createLayerControlExtentHTML.
prushforth Jul 28, 2023
f1b6c55
Get map extents working, remove _initialize call from map-feature.
prushforth Jul 28, 2023
64d7ce8
Fix determineLayerProjection function + prettier formatting
AliyanH Jul 28, 2023
08996cd
Reorganize some top level private member functions into scoped local
prushforth Jul 28, 2023
58889ba
Use promise rejection for handling events like changeprojection that
prushforth Aug 1, 2023
cde6b6b
fix ZIndex mismatch bug (TODO for ordering of map-extent) + fix broke…
AliyanH Aug 1, 2023
1c778a7
Get rid of event-based resolution of layer loading by refactor of Map…
Aug 4, 2023
3ca60f0
Don't wait for load event if map has already been initialized for lay…
AliyanH Aug 6, 2023
4fdfeb9
Change layer._mapmlvectors from being created on 'extentload' to being
prushforth Aug 8, 2023
ad11808
Add whenReady as a try at creating a promise-based API for MapML elem…
Aug 8, 2023
5af9fae
layer.js - move opacity code from setter to attributeChangedCallback
Aug 9, 2023
c427084
add whenready for map-extent
AliyanH Aug 9, 2023
b472c21
Update message in map-extent.whenReady rejection handler
prushforth Aug 9, 2023
c055333
Update domApi tests to wait on layer.whenReady() instead of timeout
prushforth Aug 9, 2023
2093717
Add whenReady to map-feature, based on _featureGroup
prushforth Aug 10, 2023
bf6e691
Add await whenLayersReady to CustomProjectionLayers.test.js fixture
prushforth Aug 10, 2023
153e558
Remove obsolete fadeAnimation setting (uses default anyway) and comment
prushforth Aug 10, 2023
144c95a
Change M.Util._pasteLayer to not listen on 'error' event, but to use
prushforth Aug 10, 2023
950a599
Fix layer opacity attribute changed callback, update tests.
prushforth Aug 10, 2023
dfaf1fe
Resolve duplication of "Zoom to here" link breakage of popupTabNaviga…
Aug 11, 2023
69536a7
Adapt feature.js to wait until the feature is added to the map to add
prushforth Aug 14, 2023
921e7d4
Refactor (some uses of) "feature" to more precise terms:
prushforth Aug 14, 2023
0cb1fd3
This commit causes a pretty major regression, probably due to incomplete
prushforth Aug 15, 2023
16c9f09
Change _convertAndFormatPCRS 'map' parameter to 'crs', since 'map'
prushforth Aug 21, 2023
6d8329e
Static tile layer changes - move code from onAdd to initialize
Sep 6, 2023
94af3d2
Resolve layer extent and disable issue
AliyanH Sep 7, 2023
601e23a
Upgrade playwright to 1.35.1
Sep 8, 2023
e595fc4
Revert / convert extentload / foo event to layer.whenReady when proce…
Sep 8, 2023
80260e3
Change uppercase / lowercase comparison to compare projection strings
Sep 8, 2023
a01eb89
Update how map-feature / mapmlvectors calculates FeatureLayer.layerBo…
prushforth Sep 11, 2023
639950d
set featureLayer._staticFeature for static features, fix failing tests
yhy0217 Sep 13, 2023
17082c7
remove default zoomBounds and layerBounds for empty mapmlvectors
yhy0217 Sep 13, 2023
739b206
remove layerbounds and zoombounds when FeatureLayer initialized as null
AliyanH Sep 14, 2023
efb596c
Add reRender() method for map-feature - untested (for discussion)
AliyanH Sep 14, 2023
d991a45
make the zoom attribute value of mapFeature as a native value, fix th…
yhy0217 Sep 18, 2023
d87d004
set the layer extent in link handler when the layer extent has not ye…
yhy0217 Sep 18, 2023
3b3dfb7
use addeventlistener for mapml event instead of .on() for leaflet event
yhy0217 Sep 19, 2023
4a67850
add parentEl.whenReady in mapFeature.whenReady as a pre-condition, av…
yhy0217 Sep 19, 2023
57a6f5a
call resetFeature in addFeature to check whether or not a feature sho…
yhy0217 Sep 19, 2023
6d97d00
Set opacity property on layer- element when changing opacity from layer
Sep 19, 2023
8f43121
Change how opacity is handled by layer - add _opacity cache that
prushforth Sep 19, 2023
7fb7914
Fix opacity when the attribute is provided at page load, _opacity is
prushforth Sep 19, 2023
ca231f3
Fix opacity when the attribute is provided at page load, _opacity is
prushforth Sep 19, 2023
90f8978
move the zoomTo logic before new layer is added and the attributeChan…
yhy0217 Sep 21, 2023
cfe2734
Add comments, function for link behaviour, projection changes. Re-order
Sep 21, 2023
f2fd5ca
fix ordering of legend parsing and setLayerTitle to get legends working
AliyanH Sep 21, 2023
79f2807
make zoomTo work for unchecked layer
AliyanH Sep 22, 2023
b2f9f08
add a parameter for convertAndFormatPCRS
AliyanH Sep 22, 2023
19f46ee
Remove 'foo' / 'extentload' event, no longer necessary
prushforth Sep 22, 2023
1ccf354
Change github tests to ignore featureIndexOverlay, run playwright
prushforth Sep 22, 2023
1e89c54
add condition for resetFeature for the connectedCallback case of map…
AliyanH Sep 22, 2023
31b5b99
Use Promise.allSettled on queries to multiple overlapping extents to
prushforth Sep 22, 2023
1b452fa
Fix how QueryHandler manages multiple fetches using Promise.allSettled
prushforth Sep 22, 2023
efb281e
remove _updateFeature as it is not being used anymore + updated _reRe…
AliyanH Sep 25, 2023
6ff586f
Replace toporama_en usage in tests with static image file
prushforth Sep 26, 2023
c4aa613
Fix onZoomEnd bug: only remove affected features based on their zoom
prushforth Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ jobs:
node-version: '18.x'
- run: sudo apt-get install xvfb
- run: npm install --legacy-peer-deps
- run: npx playwright install
- run: npm install -g grunt-cli
- run: grunt default
- run: xvfb-run --auto-servernum -- npm test
- run: xvfb-run --auto-servernum -- npm run jest
# - run: xvfb-run --auto-servernum -- npm run jest
env:
CI: true
201 changes: 125 additions & 76 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"leaflet": "^1.9.4",
"leaflet.locatecontrol": "^0.79.0",
"path": "^0.12.7",
"@playwright/test": "^1.24.2",
"playwright": "^1.24.2",
"@playwright/test": "^1.35.1",
"playwright": "^1.35.1",
"proj4": "^2.6.2",
"proj4leaflet": "^1.0.2",
"rollup": "^2.23.1"
Expand Down
Loading