Team mapml refactoring #515

prushforth · 2021-09-22T15:14:30Z

Fixes issue #511

…m-Element into team-mapml-refactoring

… Close!

…h/Web-Map-Custom-Element into refactor

…m-Element into team-mapml-refactoring

…h/Web-Map-Custom-Element into newRefactor

…Element into team-mapml-refactoring

src/mapml/layers/MapLayer.js

…l start as "map-img" tbd.

…ustom-Element into team-mapml-refactoring

… use. Fix search and replace error on style -> map-style (link relation should stay "style").

prushforth · 2021-09-23T14:33:43Z

@Malvoz @erictheise fyi this is a big change, hopefully we've covered it all. Let us know if you have concerns. We'll push the change on geogratis and experiments when this gets merged.

ahmadayubi · 2021-09-23T15:56:40Z

Should <layer-> be changed to <map-layer>?

prushforth · 2021-09-23T16:00:26Z

Should <layer-> be changed to <map-layer>?

I believe it would be quite disruptive, and the gain would be a bit more coherence. I tend towards "no, not enough benefit", but remain open to opinions.

Malvoz · 2021-09-23T16:22:05Z

If we want to be consistent we'll also have to change <mapml-> to <map-mapml> which reads a bit funny. I personally squinted at <layer-> the first time I saw it, while it is valid HTML it looks a bit awkward before getting accustomed to. We should consider if it may affect how developers, especially beginners, perceive them. And if we're to make the changes, they should probably happen in this PR.

I don't have a strong opinion on this, I'm mostly happy the polyfill is heading towards web platform compatibility. 😊

ahmadayubi · 2021-09-23T16:45:11Z

Line 965 in MapLayer.js, it's creating input elements for an extent, I believe they should be <map-input> rather than <input>. Although the fact that it didn't cause errors may mean it's either not a function being used anymore or it's not tested for.

prushforth · 2021-09-23T18:04:21Z

Although the fact that it didn't cause errors may mean it's either not a function being used anymore or it's not tested for.

I think it's this, but I'll remove that code once we've got this issue closed. Should have done it before but tempus fugit :-)

Malvoz · 2021-09-25T17:07:32Z

test/e2e/data/cbmt.mapml

+    <map-title>Canada Base Map - Transportation (CBMT)</map-title>
+    <map-meta http-equiv="Content-Type" content="text/mapml;projection=OSMTILE"></map-meta>
+    <map-meta charset="utf-8"></map-meta>
+    <map-link rel="license" href="https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/licence/17285" map-title="Canada Base Map © Natural Resources Canada"></map-link>


@prushforth I'm looking to reflect these changes in https://github.com/Maps4HTML/MapServer-documentation/tree/mapml, I'm wondering whether it was intended to change the title attribute on <map-link>(s) to map-title as well.

I'm assuming that was not intended, as it seems no other attributes use the map- prefix.

That's correct. We only changed the elements' prefix, I'll await further information as to whether it's necessary to change attributes. Fwiw I think the link title attribute would be appropriate if there's a conflict there that might be motivation to adopt map-title. We haven't done that yet, so I think it's best to keep with title for now. Btw I can't find the mapserver MapML code, I was looking to update it too. Lete know if you come across it.

MapServer doesn't actually support MapML yet, here's the implementation ticket: MapServer/MapServer#6024.

Per Maps4HTML/Web-Map-Custom-Element#515

ben-lu-uw and others added 30 commits September 14, 2021 09:07

Refactor extent element to map-extent

6c81abd

Refactor extent element to map-extent

6bdd83e

changed input elements to mapml-input

8071ceb

changed the input elements from mapml-input to map-input

43dfb75

Change <mapml> to <mapml->. No code changes required, only data + tests.

13adef8

Change <head> to <map-head>.

49f8a49

Change <body> to <map-body>

599c942

Refactor tests extent element to map-extent

e4bf66c

Refactor meta element to map-meta

87d1fff

Refactor tests meta element to map-meta

6c0aa71

refactored the tests

02d6db1

First pass at <title> -> <map-title>. Couple tests still failing.

5792387

Merge branch 'refactor' of https://github.com/ben-lu-uw/Web-Map-Custo…

b5c1527

…m-Element into team-mapml-refactoring

Resolve conflict

6ddb669

Add local versions of cbmtgeom.mapml, fdi.mapml to fix failing tests.…

e8b94d8

… Close!

Test

89874d3

Merge branch 'team-mapml-refactoring' of https://github.com/prushfort…

c8497fa

…h/Web-Map-Custom-Element into refactor

Peter - test change comment in head

b73a08f

Set ISHEADLESS

5af2efa

changed the input elements from mapml-input to map-input

a55ce4c

refactored the tests

4c52504

rebasing

dc24e41

fixing rebase

3d6db5c

Revert test changes

97bf77e

Fix conflict

3b88672

Refactor tile element to map-tile

6d58a32

Refactor tests tile element to map-tile

dcf0abb

Fix failing tests by creating local mapml files that can be refactored.

ccd6365

Refactor tile element to map-tile

0d50711

Refactor tests tile element to map-tile

6c4a42c

prushforth and others added 4 commits September 22, 2021 10:01

span -> map-span

f71a491

Merge branch 'refactor' of https://github.com/ben-lu-uw/Web-Map-Custo…

ad4b1fc

…m-Element into team-mapml-refactoring

Merge branch 'team-mapml-refactoring' of https://github.com/prushfort…

3218cde

…h/Web-Map-Custom-Element into newRefactor

Merge branch 'master' of https://github.com/Maps4HTML/Web-Map-Custom-…

54a92ff

…Element into team-mapml-refactoring

ahmadayubi reviewed Sep 22, 2021

View reviewed changes

src/mapml/layers/MapLayer.js Outdated Show resolved Hide resolved

prushforth and others added 7 commits September 22, 2021 11:59

Get rid of "image" element (not implemented yet, if it will be it wil…

3e66622

…l start as "map-img" tbd.

Resolve unrefactored INPUT.

8eda9ff

refactored style to map-style and fixed a few other things

658898c

fixed a few other issues

fcc0370

Merge branch 'newRefactor' of https://github.com/Anshpreet8/Web-Map-C…

a4a11a6

…ustom-Element into team-mapml-refactoring

Bit of cleanup for html custom element syntax. Remove "image" element…

49567ff

… use. Fix search and replace error on style -> map-style (link relation should stay "style").

Fix markup errors

b4184a7

prushforth mentioned this pull request Sep 23, 2021

Correct HTML namespaces #489

Merged

prushforth marked this pull request as ready for review September 23, 2021 14:31

prushforth requested review from Malvoz and erictheise September 23, 2021 14:32

Anshpreet and others added 2 commits September 23, 2021 12:51

fixed some input->map-input

dee3ccd

Merge anshpreet/newRefactor into team-mapml-refactoring

fc63d77

prushforth merged commit c67198b into Maps4HTML:master Sep 23, 2021

prushforth deleted the team-mapml-refactoring branch September 23, 2021 20:30

Malvoz reviewed Sep 25, 2021

View reviewed changes

Malvoz added a commit to Maps4HTML/MapServer-documentation that referenced this pull request Sep 25, 2021

Update elements to reflect MapML refactoring to custom elements

518881a

Per Maps4HTML/Web-Map-Custom-Element#515

Malvoz mentioned this pull request Oct 4, 2021

Finish conversion to custom elements Maps4HTML/experiments#63

Closed

Malvoz mentioned this pull request Nov 28, 2021

Outdated Maps4HTML/pygeoapi-mapml-formatter#4

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Team mapml refactoring #515

Team mapml refactoring #515

prushforth commented Sep 22, 2021

prushforth commented Sep 23, 2021

ahmadayubi commented Sep 23, 2021

prushforth commented Sep 23, 2021

Malvoz commented Sep 23, 2021

ahmadayubi commented Sep 23, 2021 •

edited

Loading

prushforth commented Sep 23, 2021 •

edited

Loading

Malvoz Sep 25, 2021

Malvoz Sep 25, 2021

prushforth Sep 25, 2021

Malvoz Sep 25, 2021

Team mapml refactoring #515

Team mapml refactoring #515

Conversation

prushforth commented Sep 22, 2021

prushforth commented Sep 23, 2021

ahmadayubi commented Sep 23, 2021

prushforth commented Sep 23, 2021

Malvoz commented Sep 23, 2021

ahmadayubi commented Sep 23, 2021 • edited Loading

prushforth commented Sep 23, 2021 • edited Loading

Malvoz Sep 25, 2021

Choose a reason for hiding this comment

Malvoz Sep 25, 2021

Choose a reason for hiding this comment

prushforth Sep 25, 2021

Choose a reason for hiding this comment

Malvoz Sep 25, 2021

Choose a reason for hiding this comment

ahmadayubi commented Sep 23, 2021 •

edited

Loading

prushforth commented Sep 23, 2021 •

edited

Loading