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.

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

Switch to OpenLayers for the main view #112

Merged
merged 47 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
3cc7472
Zoom color rough wip
gjmooney Aug 22, 2024
8ad0c83
Save
gjmooney Aug 22, 2024
a3e4844
CSS stuff
gjmooney Aug 22, 2024
41a8484
Save
gjmooney Aug 22, 2024
aa0f55b
ugh rjsf close enough
gjmooney Aug 23, 2024
40785b4
Start playing with ol
gjmooney Aug 26, 2024
1377727
save
gjmooney Aug 27, 2024
164b22d
Progress
gjmooney Aug 27, 2024
417fee6
more progress
gjmooney Aug 27, 2024
e79098f
Change zoom terminology for color stuff
gjmooney Aug 27, 2024
a5c8bbe
Start converting MainView
gjmooney Aug 27, 2024
8ec72bc
Add more parity
gjmooney Aug 28, 2024
e47656c
Fix visiblity
gjmooney Aug 28, 2024
7fd15c1
Add GeoJson
gjmooney Aug 28, 2024
36fef77
Update hillsahde example
gjmooney Aug 28, 2024
61d7cfb
Image nonsense
gjmooney Aug 29, 2024
6440efb
its fine
gjmooney Aug 29, 2024
fd4cce2
Update image example
gjmooney Aug 29, 2024
34fd1fe
Add proejction to options
gjmooney Aug 29, 2024
90751d1
Fix zoom
gjmooney Aug 29, 2024
1e5512b
GeoJSON switch up
gjmooney Aug 29, 2024
5d260ae
Get vector update working
gjmooney Aug 29, 2024
664f39a
Something GeoJson filter something
gjmooney Aug 30, 2024
de89505
Add example
gjmooney Aug 30, 2024
d5bbb75
Examples and things
gjmooney Aug 30, 2024
4fed6e5
GeoTiff examples and source
gjmooney Sep 2, 2024
7ef66ba
Cleaning
gjmooney Sep 2, 2024
b28a13e
Get drag n drop working again
gjmooney Sep 2, 2024
9c0020b
Add color to web gl layers
gjmooney Sep 2, 2024
86aa8ca
Examples
gjmooney Sep 2, 2024
67c1331
Filters working?
gjmooney Sep 3, 2024
c0ce56f
Clean up
gjmooney Sep 3, 2024
441ea6e
Clean imports
gjmooney Sep 3, 2024
cd9fa8d
PmTiles and vector tile updates
gjmooney Sep 3, 2024
d8c0e7c
Remove video options
gjmooney Sep 3, 2024
d1c81c4
Color Stuff schema
gjmooney Sep 3, 2024
a9744c2
Update tests
gjmooney Sep 3, 2024
1263a72
Rename MainView
gjmooney Sep 3, 2024
7f9a137
Update pmtile examples
gjmooney Sep 3, 2024
3df1ac9
Remove log prints
gjmooney Sep 3, 2024
3968f38
Add OpenLayers CSS
gjmooney Sep 3, 2024
b328f6f
Missed rename thing
gjmooney Sep 3, 2024
290481a
Restore basic color picker for geojson layers
gjmooney Sep 3, 2024
451e91b
Remove more comments
gjmooney Sep 3, 2024
87f036e
Fix commands and remove another comment
gjmooney Sep 3, 2024
59cefd9
Remove map libre remnants
gjmooney Sep 3, 2024
3c2d443
Beep boop update snapshots
gjmooney Sep 4, 2024
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
44 changes: 18 additions & 26 deletions examples/3d_terrain.jGIS
Original file line number Diff line number Diff line change
@@ -1,45 +1,35 @@
{
"layerTree": [
"a82ef521-e727-4209-a5a0-145d66f18a06",
"733327dc-c367-420c-9ee1-0510ee521457"
"f12a8dfe-4674-43e7-a649-cd49ee83eb34"
],
"layers": {
"733327dc-c367-420c-9ee1-0510ee521457": {
"name": "Custom Hillshade Layer Layer",
"parameters": {
"shadowColor": "#473B24",
"source": "1f457f60-5d31-45f6-8066-4585aabd5629"
},
"type": "HillshadeLayer",
"visible": true
},
"a82ef521-e727-4209-a5a0-145d66f18a06": {
"name": "OpenStreetMap.Mapnik Layer",
"parameters": {
"source": "ceef4036-b757-44bf-8a21-42c6c99dab72"
},
"type": "RasterLayer",
"visible": true
},
"f12a8dfe-4674-43e7-a649-cd49ee83eb34": {
"name": "Custom Hillshade Layer",
"parameters": {
"shadowColor": "#473B24",
"source": "e87bb91a-ff2a-485b-bf0e-14b3b848955a"
},
"type": "HillshadeLayer",
"visible": true
}
},
"options": {
"bearing": 0.0,
"latitude": 47.27340570466396,
"longitude": 11.540279388427734,
"latitude": 47.25967099028631,
"longitude": 11.418052209432549,
"pitch": 59.00000000000003,
"zoom": 11.829283007646955
},
"sources": {
"1f457f60-5d31-45f6-8066-4585aabd5629": {
"name": "Custom Raster DEM Source",
"parameters": {
"attribution": "w",
"tileSize": 256.0,
"url": "https://demotiles.maplibre.org/terrain-tiles/tiles.json",
"urlParameters": {}
},
"type": "RasterDemSource"
},
"ceef4036-b757-44bf-8a21-42c6c99dab72": {
"name": "OpenStreetMap.Mapnik",
"parameters": {
Expand All @@ -52,11 +42,13 @@
},
"type": "RasterSource"
},
"cffe76e7-fa97-445a-98dc-a2861f5782ca": {
"name": "Terrain tile source",
"e87bb91a-ff2a-485b-bf0e-14b3b848955a": {
"name": "Custom Hillshade Layer Source",
"parameters": {
"tileSize": 256.0,
"url": "https://demotiles.maplibre.org/terrain-tiles/tiles.json"
"encoding": "mapbox",
"tileSize": 512.0,
"url": "https://s3.amazonaws.com/elevation-tiles-prod/terrarium/{z}/{x}/{y}.png",
"urlParameters": {}
},
"type": "RasterDemSource"
}
Expand Down
16 changes: 9 additions & 7 deletions examples/buildings.jGIS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"sourceLayer": "bingmlbuildings",
"type": "fill"
},
"type": "VectorLayer",
"type": "VectorTileLayer",
"visible": true
},
"f99eb7b0-5e38-4078-b310-36a0746472aa": {
Expand All @@ -26,11 +26,12 @@
}
},
"options": {
"latitude": 41.86704023051254,
"longitude": -87.64128426232207,
"zoom": 8.089610803710057,
"bearing": 0.0,
"pitch": 0.0
"latitude": 41.86704023051257,
"longitude": -87.64128426232207,
"pitch": 0.0,
"projection": "EPSG:3857",
"zoom": 8.089610803710057
},
"sources": {
"7a7ee6fd-c1e2-4c5d-a4e2-a7974db138a4": {
Expand All @@ -55,5 +56,6 @@
},
"type": "RasterSource"
}
}
}
},
"terrain": {}
}
64 changes: 64 additions & 0 deletions examples/earthquakes-no-filter.jGIS
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"layerTree": [
"f907e26c-c4c8-4c2d-ad62-813f63ed9de9",
"0336896f-f7ce-460f-8d11-07a589ff03d8"
],
"layers": {
"0336896f-f7ce-460f-8d11-07a589ff03d8": {
"filters": {
"appliedFilters": [],
"logicalOp": "all"
},
"name": "Custom GeoJSON Layer",
"parameters": {
"color": "#FF0000",
"opacity": 1.0,
"source": "d07cc573-51fb-4ae8-965b-a0082ace7f2b",
"type": "circle"
},
"type": "VectorLayer",
"visible": true
},
"f907e26c-c4c8-4c2d-ad62-813f63ed9de9": {
"name": "OpenStreetMap.Mapnik Layer",
"parameters": {
"source": "5fe556bc-9938-4217-8de6-fe25aef088c2"
},
"type": "RasterLayer",
"visible": true
}
},
"options": {
"bearing": 0.0,
"latitude": 38.612326230162665,
"longitude": -119.77357975468912,
"pitch": 0.0,
"projection": "EPSG:3857",
"zoom": 5.161762963106246
},
"sources": {
"5fe556bc-9938-4217-8de6-fe25aef088c2": {
"name": "OpenStreetMap.Mapnik",
"parameters": {
"attribution": "(C) OpenStreetMap contributors",
"maxZoom": 19.0,
"minZoom": 0.0,
"provider": "OpenStreetMap",
"url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
"urlParameters": {}
},
"type": "RasterSource"
},
"d07cc573-51fb-4ae8-965b-a0082ace7f2b": {
"name": "Custom GeoJSON Layer Source",
"parameters": {
"path": "eq.json"
},
"type": "GeoJSONSource"
}
},
"terrain": {
"exaggeration": 0.0,
"source": ""
}
}
11 changes: 6 additions & 5 deletions examples/earthquakes.jGIS
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
{
"feature": "mag",
"operator": ">",
"value": 2.47
"value": 6.5
}
],
"logicalOp": "all"
},
"name": "Custom GeoJSON Layer",
"parameters": {
"color": "#865e3c",
"color": "#000000",
"opacity": 1.0,
"source": "d07cc573-51fb-4ae8-965b-a0082ace7f2b",
"type": "circle"
Expand All @@ -36,10 +36,11 @@
},
"options": {
"bearing": 0.0,
"latitude": 39.19439624539356,
"longitude": -121.55020132126549,
"latitude": 25.012589761592906,
"longitude": -109.44110652310296,
"pitch": 0.0,
"zoom": 4.630124252560623
"projection": "EPSG:3857",
"zoom": 3.843213728870569
},
"sources": {
"5fe556bc-9938-4217-8de6-fe25aef088c2": {
Expand Down
104 changes: 53 additions & 51 deletions examples/france_hiking.jGIS
Original file line number Diff line number Diff line change
@@ -1,87 +1,89 @@
{
"layerTree": [
"4a0703b3-ed56-4158-8a2e-e008c3d0fee2",
"7db81237-a579-4daa-938f-5e61fdfb17e7",
"0bfee293-9e2f-4434-8c5a-c90d19836bab"
],
"layers": {
"7db81237-a579-4daa-938f-5e61fdfb17e7": {
"name": "NASAGIBS.ModisTerraTrueColorCR Layer",
"visible": true,
"parameters": {
"source": "52252f5d-3cb7-45a8-a724-5793bf9950ec",
"opacity": 0.3
},
"type": "RasterLayer"
},
"0bfee293-9e2f-4434-8c5a-c90d19836bab": {
"name": "WaymarkedTrails.hiking Layer",
"type": "RasterLayer",
"parameters": {
"opacity": 0.6,
"source": "82691e55-f9e2-43be-8a07-3ae0409af7b4"
},
"type": "RasterLayer",
"visible": true
},
"4a0703b3-ed56-4158-8a2e-e008c3d0fee2": {
"name": "OpenStreetMap.Mapnik Layer",
"visible": true,
"type": "RasterLayer",
"parameters": {
"source": "60da082e-8b70-4fa2-b2f0-48524468fea0"
}
},
"type": "RasterLayer",
"visible": true
},
"7db81237-a579-4daa-938f-5e61fdfb17e7": {
"name": "NASAGIBS.ModisTerraTrueColorCR Layer",
"parameters": {
"opacity": 0.3,
"source": "52252f5d-3cb7-45a8-a724-5793bf9950ec"
},
"type": "RasterLayer",
"visible": true
}
},
"options": {
"bearing": 0.0,
"latitude": 46.623742146769416,
"longitude": 1.6082511087276998,
"pitch": 0.0,
"projection": "EPSG:3857",
"zoom": 4.947275971927249
},
"sources": {
"60da082e-8b70-4fa2-b2f0-48524468fea0": {
"type": "RasterSource",
"parameters": {
"url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
"minZoom": 0.0,
"maxZoom": 19.0,
"urlParameters": {},
"provider": "OpenStreetMap",
"attribution": "(C) OpenStreetMap contributors"
},
"name": "OpenStreetMap.Mapnik"
},
"52252f5d-3cb7-45a8-a724-5793bf9950ec": {
"name": "NASAGIBS.ModisTerraTrueColorCR",
"parameters": {
"attribution": "Imagery provided by services from the Global Imagery Browse Services (GIBS), operated by the NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding provided by NASA/HQ.",
"maxZoom": 9.0,
"minZoom": 1.0,
"provider": "NASAGIBS",
"url": "https://map1.vis.earthdata.nasa.gov/wmts-webmerc/{variant}/default/{time}/{tilematrixset}{max_zoom}/{z}/{y}/{x}.{format}",
"urlParameters": {
"time": "2024-07-07",
"tilematrixset": "GoogleMapsCompatible_Level",
"format": "jpg",
"tilematrixset": "GoogleMapsCompatible_Level",
"time": "2024-07-07",
"variant": "MODIS_Terra_CorrectedReflectance_TrueColor"
},
"url": "https://map1.vis.earthdata.nasa.gov/wmts-webmerc/{variant}/default/{time}/{tilematrixset}{max_zoom}/{z}/{y}/{x}.{format}",
"minZoom": 1.0,
"maxZoom": 9.0,
"attribution": "Imagery provided by services from the Global Imagery Browse Services (GIBS), operated by the NASA/GSFC/Earth Science Data and Information System (ESDIS) with funding provided by NASA/HQ.",
"provider": "NASAGIBS"
}
},
"type": "RasterSource"
},
"60da082e-8b70-4fa2-b2f0-48524468fea0": {
"name": "OpenStreetMap.Mapnik",
"parameters": {
"attribution": "(C) OpenStreetMap contributors",
"maxZoom": 19.0,
"minZoom": 0.0,
"provider": "OpenStreetMap",
"url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png",
"urlParameters": {}
},
"name": "NASAGIBS.ModisTerraTrueColorCR",
"type": "RasterSource"
},
"82691e55-f9e2-43be-8a07-3ae0409af7b4": {
"name": "WaymarkedTrails.hiking",
"type": "RasterSource",
"parameters": {
"minZoom": 0.0,
"url": "https://tile.waymarkedtrails.org/{variant}/{z}/{x}/{y}.png",
"attribution": "Map data: (C) OpenStreetMap contributors | Map style: (C) waymarkedtrails.org (CC-BY-SA)",
"maxZoom": 18.0,
"minZoom": 0.0,
"provider": "WaymarkedTrails",
"url": "https://tile.waymarkedtrails.org/{variant}/{z}/{x}/{y}.png",
"urlParameters": {
"variant": "hiking"
}
}
},
"type": "RasterSource"
}
},
"options": {
"latitude": 46.623742146769416,
"zoom": 4.947275971927249,
"longitude": 1.6082511087276998,
"bearing": 0.0,
"pitch": 0.0
},
"layerTree": [
"4a0703b3-ed56-4158-8a2e-e008c3d0fee2",
"7db81237-a579-4daa-938f-5e61fdfb17e7",
"0bfee293-9e2f-4434-8c5a-c90d19836bab"
]
}
"terrain": {}
}
Loading
Loading