WIP: WIP Rewrite mapcss files from pseudo-tags to OM types #31

Draft

pastk wants to merge 1 commit from pastk-feature-types-migration into master

pastk commented

2024-12-02 19:11:15 +00:00

Member

Migrate mapcss files from pseudo-tags notation to direct usage of OM feature types.

E.g.

-area|z13-[natural=water][water=ditch],
-area|z13-[natural=water][water=drain],
-area|z12-[natural=water][water=wastewater],
+area|z13-|natural-water-ditch,
+area|z13-|natural-water-drain,
+area|z12-|natural-water-wastewater,
 {fill-color: @water_bad;}

Migrate mapcss files from pseudo-tags notation to direct usage of OM feature types. E.g. ```diff -area|z13-[natural=water][water=ditch], -area|z13-[natural=water][water=drain], -area|z12-[natural=water][water=wastewater], +area|z13-|natural-water-ditch, +area|z13-|natural-water-drain, +area|z12-|natural-water-wastewater, {fill-color: @water_bad;} ```

This pull request has changes conflicting with the target branch.

src/mapcss/__init__.py

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin pastk-feature-types-migration:pastk-feature-types-migration

git checkout pastk-feature-types-migration

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master

git merge --no-ff pastk-feature-types-migration

git checkout pastk-feature-types-migration

git rebase master

git checkout master

git merge --ff-only pastk-feature-types-migration

git checkout pastk-feature-types-migration

git rebase master

git checkout master

git merge --no-ff pastk-feature-types-migration

git checkout master

git merge --squash pastk-feature-types-migration