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

Fix dangling underscores #6

Open
wants to merge 4 commits into
base: ol-cesium
Choose a base branch
from
Open

Fix dangling underscores #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d74451d
fix for get3dFeatureInfo on OL primitives
patrikmalvenius Oct 7, 2022
12379ba
add overhaul of globe, new threedtile layer type
patrikmalvenius Apr 6, 2023
579cb1e
clean up code
patrikmalvenius Apr 6, 2023
f3f75ab
remove danlging underscores
patrikmalvenius Apr 6, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ css/style.css
node_modules
npm-debug-log
plugins
index.json
240 changes: 137 additions & 103 deletions index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,52 +80,10 @@
}
}
},
"cesiumIontoken": "",
"cesium3dTiles": [
{
"url": "OSM-Buildings",
"maximumScreenSpaceError": 2,
"outline": true,
"shadows": true,
"filter": "${feature['elementId']} !== 251329024 && ${feature['elementId']} !== 425027205 && ${feature['elementId']} !== 425002757",
"style": [
[
"${feature['building']} === 'civic' || ${feature['building']} === 'construction' || ${feature['building']} === 'church'",
"color('#ed6258', 1)"
],
[
"${feature['building']} === 'commercial' || ${feature['building']} === 'retail' || ${feature['building']} === 'office'",
"color('#af8b74', 1)"
],
[
"${feature['building']} === 'apartments' || ${feature['building']} === 'residential' || ${feature['building']} === 'house' || ${feature['building']} === 'yes' || ${feature['building']} === 'roof'",
"color('#c98754', 1)"
],
[
"${feature['building']} === 'warehouse' || ${feature['building']} === 'manufacture' || ${feature['building']} === 'industrial'",
"color('#919494', 1)"
],
[
"${feature['building']} === 'school' || ${feature['amenity']} === 'university' || ${feature['building']} === 'kindergarten'",
"color('#ef7f77', 1)"
],
[
"${feature['building']} === 'parking' || ${feature['amenity']} === 'parking' || ${feature['building']} === 'garages' || ${feature['building']} === 'garage'",
"color('#af8b74', 1)"
],
[
"${feature['building']} === 'farm_auxiliary' || ${feature['building']} === 'detached'",
"color('#a69774', 1)"
],
[
true,
"color('#ef7f77', 1)"
]
]
}
],
"cesiumIontoken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1ODc3ZjRhMS05OTkzLTQ1Y2UtOTYwZi1jMmU4Zjg1MDAwN2YiLCJpZCI6MTA2MDg0LCJpYXQiOjE2Nzk1NjcyNTJ9.JYFj4MaEJdhIB7O2K5hrBFIXgMLU-ea9bBiK4r0xRn0",
"cesium3dTiles": [],
"cesiumTerrainProvider": "",
"cesiumIonassetIdTerrain": ""
"cesiumIonassetIdTerrain": 1
}
}
],
Expand All @@ -141,61 +99,46 @@
},
"projectionCode": "EPSG:3857",
"projectionExtent": [
-20037508.34,
-20037508.34,
20037508.34,
20037508.34
-20037508.342789244, -20037508.342789244, 20037508.342789244,
20037508.342789244
],
"extent": [
-20037508.34,
-20037508.34,
20037508.34,
20037508.34
"proj4Defs": [
{
"code": "EPSG:3006",
"projection": "+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
}
],
"center": [
1770000,
8770000
"extent": [
-20037508.342789244, -20037508.342789244, 20037508.342789244,
20037508.342789244
],
"zoom": 7,
"center": [-105000, 5371000],
"tileGridOptions": {
"alignBottomLeft": false
},
"zoom": 13,
"resolutions": [
156543.03390625,
78271.516953125,
39135.7584765625,
19567.87923828125,
9783.939619140625,
4891.9698095703125,
2445.9849047851562,
1222.9924523925781,
611.4962261962891,
305.74811309814453,
152.87405654907226,
76.43702827453613,
38.218514137268066,
19.109257068634033,
9.554628534317017,
4.777314267158508,
2.388657133579254,
1.194328566789627,
0.5971642833948135,
0.29858214169740677,
0.14929107084870338,
0.07464553542435169,
0.037322767712175846,
0.018661383856087923,
0.009330691928043961,
0.004665345964021981,
0.0023326729820109904,
0.0011663364910054952,
5.831682455027476E-4,
2.915841227513738E-4,
1.457920613756869E-4
156543.033928041, 78271.51696402048, 39135.75848201023, 19567.87924100512,
9783.939620502561, 4891.96981025128, 2445.98490512564, 1222.99245256282,
611.49622628141, 305.7481131407048, 152.8740565703525, 76.43702828517624,
38.21851414258813, 19.10925707129406, 9.554628535647032, 4.777314267823516,
2.388657133911758, 1.194328566955879
],
"featureinfoOptions": {
"infowindow": "overlay"
"infowindow": "infowindow"
},
"source": {
"local": {
"url": "http://localhost/geoserver/wms"
"url": "http://localhost:11111/geoserver/wms",
"projection": "EPSG:3857"
},
"local_wmts": {
"url": "http://localhost:11111/geoserver/gwc/service/wmts",
"matrixIdsPrefix": "EPSG:4326:",
"matrixSet": "EPSG:4326"
},
"ahocevar": {
"url": "https://ahocevar.com/geoserver/wms"
}
},
"groups": [
Expand All @@ -207,18 +150,110 @@
],
"layers": [
{
"name": "origo-cities",
"title": "Origokommuner",
"name": "Test:sauveterre",
"source": "local",
"title": "Test:sauveterre",
"group": "root",
"source": "data/origo-cities-3857.geojson",
"style": "origo-logo",
"type": "GEOJSON",
"attributes": [
{
"name": "name"
}
],
"visible": true
"queryable": true,
"style": "orto",
"type": "WMS",
"visible": true,
"attribution": "&copy Patriks Goa Grejer",
"format": "image/png"
},
{
"name": "OSMSTUFF",
"title": "OSMSTUFF_TITLE",
"type": "THREEDTILE",
"url": "OSM-Buildings",
"group": "root",
"queryable": true,
"maximumScreenSpaceError": 16,
"outline": true,
"shadows": true,
"visible": false,
"filter": "${feature['elementId']} !== 251329024 && ${feature['elementId']} !== 425027205 && ${feature['elementId']} !== 425002757",
"style": [
[
"${feature['building']} === 'civic' || ${feature['building']} === 'construction' || ${feature['building']} === 'church'",
"color('#ed6258', 1)"
],
[
"${feature['building']} === 'commercial' || ${feature['building']} === 'retail' || ${feature['building']} === 'office'",
"color('#af8b74', 1)"
],
[
"${feature['building']} === 'apartments' || ${feature['building']} === 'residential' || ${feature['building']} === 'house' || ${feature['building']} === 'yes' || ${feature['building']} === 'roof'",
"color('#c98754', 1)"
],
[
"${feature['building']} === 'warehouse' || ${feature['building']} === 'manufacture' || ${feature['building']} === 'industrial'",
"color('#919494', 1)"
],
[
"${feature['building']} === 'school' || ${feature['amenity']} === 'university' || ${feature['building']} === 'kindergarten'",
"color('#ef7f77', 1)"
],
[
"${feature['building']} === 'parking' || ${feature['amenity']} === 'parking' || ${feature['building']} === 'garages' || ${feature['building']} === 'garage'",
"color('#af8b74', 1)"
],
[
"${feature['building']} === 'farm_auxiliary' || ${feature['building']} === 'detached'",
"color('#a69774', 1)"
],
[true, "color('#ef7f77', 1)"]
]
},
{
"name": "threedtileChurch",
"title": "CHURCH",
"url": 1286474,
"group": "root",
"maximumScreenSpaceError": 16,
"outline": true,
"shadows": true,
"visible": true,
"type": "THREEDTILE"
},
{
"name": "Test:sauveterre_4326",
"source": "local",
"title": "Test:sauveterre_4326",
"group": "root",
"queryable": true,
"style": "orto",
"type": "WMS",
"visible": true,
"attribution": "&copy Patriks Goa Grejer",
"format": "image/png"
},

{
"name": "tiger:poly_landmarks",
"source": "local",
"title": "tiger:poly_landmarks",
"group": "root",
"queryable": true,
"style": "orto",
"type": "WMS",
"visible": true,
"attribution": "&copy Patriks Goa Grejer",
"format": "image/png",
"renderMode": "image"
},
{
"name": "topp:states",
"source": "local",
"title": "topp:states",
"group": "root",
"queryable": true,
"style": "orto",
"type": "WMS",
"visible": true,
"attribution": "&copy Patriks Goa Grejer",
"format": "image/png",
"renderMode": "image"
},
{
"name": "osm",
Expand Down Expand Up @@ -326,4 +361,3 @@
]
}
}

Loading