Skip to content

Share restaurants between examples. Update feature tabindex in feature linking example. #92

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

Merged
merged 6 commits into from
Jan 12, 2022
Merged

Share restaurants between examples. Update feature tabindex in feature linking example. #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80ba471
Update dist to pre-integrate work from https://github.com/Maps4HTML/W…
prushforth Dec 17, 2021
980dd6b
Merge branch 'main' of https://github.com/Maps4HTML/experiments into …
prushforth Dec 17, 2021
a82c63d
Merge branch 'main' of https://github.com/Maps4HTML/experiments into …
prushforth Jan 12, 2022
74dd8c3
[AUTO] Sync MapML Build
prushforth Jan 12, 2022
5961de9
[AUTO] Sync MapML Build
prushforth Jan 12, 2022
4ac3c21
Share restaurants across examples. Add tabindex to building part exam…
prushforth Jan 12, 2022
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
16 changes: 12 additions & 4 deletions dist/layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,18 @@ export class MapLayer extends HTMLElement {
let type = layerTypes[j];
if(this.checked && layer[type]){
if(type === "_templatedLayer"){
for(let j =0;j<layer[type]._templates.length;j++){
if(layer[type]._templates[j].rel ==="query") continue;
total++;
if(!(layer[type]._templates[j].layer.isVisible))count++;
for(let i =0;i<layer._extent._mapExtents.length;i++){
for(let j = 0; j < layer._extent._mapExtents[i].templatedLayer._templates.length; j++){
if(layer._extent._mapExtents[i].templatedLayer._templates[j].rel ==="query") continue;
total++;
layer._extent._mapExtents[i].removeAttribute("disabled");
layer._extent._mapExtents[i].disabled = false;
if(!(layer._extent._mapExtents[i].templatedLayer._templates[j].layer.isVisible)){
count++;
layer._extent._mapExtents[i].setAttribute("disabled", "");
layer._extent._mapExtents[i].disabled = true;
}
}
}
} else {
total++;
Expand Down
4 changes: 2 additions & 2 deletions dist/mapml.css
View file
Open in desktop

Large diffs are not rendered by default.

1,284 changes: 700 additions & 584 deletions dist/mapml.js
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/mapml.min.js
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 18 additions & 3 deletions i18n/rtl/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,24 @@
<link rel="stylesheet" href="../../global.css">
</head>
<body>
<mapml-viewer dir="rtl" projection="CBMTILE" zoom="17" lat="45.4069740362364" lon="-75.70155300710053" controls>
<layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
<layer- label="Ottawa Restaurants" src="restaurants.mapml" checked></layer->
<mapml-viewer dir="rtl" projection="OSMTILE" zoom="15" lat="45.4069740362364" lon="-75.70155300710053" controls>
<layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/osmtile/cbmt/" checked></layer->
<layer- id="restaurant" label="Ottawa Restaurants" checked>
<map-meta name="cs" content="gcrs" ></map-meta>
<map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta>
<map-extent units="OSMTILE">
<map-select id="restaurants" name="cusine">
<map-option value="restaurants" selected>All cuisines</map-option>
<map-option value="african">African</map-option>
<map-option value="asian">Asian</map-option>
<map-option value="cajun">Cajun</map-option>
<map-option value="indian">Indian</map-option>
<map-option value="italian">Italian</map-option>
<map-option value="mexican">Mexican</map-option>
</map-select>
<map-link tref="../../shared/restaurants/{cusine}.mapml" rel="features"/>
</map-extent>
</layer->
</mapml-viewer>
</body>
</html>
Loading