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

[WIP] Support for craft #3126

Closed
wants to merge 3 commits into from

Conversation

james2432
Copy link
Contributor

@james2432 james2432 commented Mar 17, 2018

Related to Issue #1697
Craft icons added
SQL update for craft to be selected

Done:

  • tailor
  • plumber
  • shoemaker
  • winery
  • photographer

What's left (After feed back):
Colour of icons:

  • Brown
  • Purple
  • Orange

Icons:

  • metal_construction (icon needed)
  • gardener (consensus on adding it?)
  • confectionery (consensus on adding it?)
  • brewery (no stroke to be used)
  • carpenter (no stroke to be used)
  • electrician (no stroke to be used)

From https://www.openstreetmap.org/#map=19/44.25915/-76.58217 (node)
image

image

From https://www.openstreetmap.org/#map=19/42.50290/-83.18880 (way):
image

image

image

@Tomasz-W
Copy link

I'm not sure about amenity-brown color for this feature, maybe shop-violet would fit better? What do you think?

@james2432
Copy link
Contributor Author

Was following what was said here: #1697 (comment)

I can change it, it's pretty trivial compared to the rest

@james2432
Copy link
Contributor Author

Purple would look like this:
image

@james2432 james2432 changed the title Issue #1697 Basic support for craft [WIP] Issue #1697 Support for craft Mar 17, 2018
@kocio-pl
Copy link
Collaborator

We should discuss the tagging question of craft/shop=tailor on Tagging list before merging - it's not clear for me which one should we use (or maybe both).

@polarbearing
Copy link
Contributor

craft/shop=tailor has a semantic difference that would justify to support both. It also has a tagging issue that shop was used for quite long before craft=* generally came up.

@kocio-pl
Copy link
Collaborator

kocio-pl commented Mar 18, 2018

As a tip for discussion - here is the dynamic of using both tags:
taghistory 15

@jragusa
Copy link
Contributor

jragusa commented Mar 19, 2018

craft=dressmaker should be also included. According to the wiki, tailor is for men and dressmaker for women

@james2432
Copy link
Contributor Author

@jragusa Yet the wiki page has: "It has been proposed that this page or section be merged with Tag:craft=tailor"

@james2432 james2432 changed the title [WIP] Issue #1697 Support for craft [WIP] Support for craft Mar 20, 2018
@Tomasz-W
Copy link

@james2432 Can you upload test renderings of rest of icons?

@james2432
Copy link
Contributor Author

have to rework the query as this would require database re-import. I need to use hstore via the tags->'craft' instead

@matthijsmelissen
Copy link
Collaborator

@james2432 Are you planning to continue working on this? This would something that's definitely nice to have. Is there any input you need from us?

@james2432
Copy link
Contributor Author

yeah was planning on working on this tonight, was busy with life stuff

@james2432
Copy link
Contributor Author

I do need icons for metal_construction and gardener and whether or not confectionary has a consensus on being added or not

@james2432
Copy link
Contributor Author

Brown:
image

grey:
image

Orange(gastronomy)#c64803:
image

@meased
Copy link
Contributor

meased commented May 9, 2018

What do you think about using the new office blue color?

Copy link
Collaborator

@pnorman pnorman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SVGs need some cleanup to meet our requirements. My biggest concern is adding another column to the amenity and text layers. This should not be done without a very good reason because it can result in a combinatorial explosion.

I haven't reviewed it for cartographic issues, including if we want to render these features, only technical issues.

@@ -1493,7 +1493,8 @@ Layer:
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END,
'craft' || CASE WHEN tags->'craft' IN ('brewery','carpenter','electrician','plumber','shoemaker','winery','photographer','tailor') THEN '' ELSE NULL END
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be craft_

@@ -1515,6 +1516,8 @@ Layer:
tags->'tower:construction' as "tower:construction",
tags->'tower:type' as "tower:type",
tags->'castle_type' as castle_type,
CASE WHEN tags->'craft' IN ('brewery','carpenter','electrician','plumber','shoemaker','winery','photographer','tailor') THEN tags->'craft'
ELSE '' END AS craft,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add another column?

project.mml Show resolved Hide resolved
project.mml Show resolved Hide resolved
project.mml Show resolved Hide resolved
project.mml Show resolved Hide resolved
<path
id="rect4506"
d="M 3.8046875 0 L 3.8046875 8.7617188 C 3.7285227 8.9177589 3.6311407 9.0540968 3.5175781 9.171875 C 3.4547352 9.2370506 3.3845279 9.2938724 3.3125 9.3496094 C 2.7797576 9.7366959 2.0181416 9.9253346 1.359375 10.191406 C 1.356115 10.192706 1.3528594 10.195966 1.3496094 10.197266 C 0.68757606 10.452233 0.13097313 10.788486 0.017578125 11.523438 L 9.1621094 11.523438 C 9.1616704 11.520735 9.1606562 11.518425 9.1601562 11.515625 L 9.171875 11.515625 C 9.003902 10.426724 7.8653083 10.209518 6.8496094 9.8359375 C 6.7296813 9.7910775 6.60877 9.7470309 6.4941406 9.6972656 C 6.3139369 9.6180409 6.1477976 9.5255211 5.9921875 9.4199219 C 5.9699953 9.4048621 5.9414506 9.3946573 5.9199219 9.3789062 C 5.6952414 9.2145238 5.5143786 9.0057916 5.3867188 8.7421875 L 5.3867188 0 L 3.8046875 0 z M 10.507812 0 C 10.346604 0 10.216797 0.13176108 10.216797 0.29296875 L 10.216797 0.88085938 C 8.5213416 1.021624 7.1643296 2.3727038 7.0175781 4.0664062 C 7.6847499 4.0093119 8.3131268 3.7652412 8.8496094 3.3515625 L 9.1054688 3.1523438 L 9.2753906 3.4296875 C 9.5820357 3.9280586 10.005937 4.3402768 10.507812 4.6308594 C 11.009688 4.3402768 11.433735 3.9280586 11.740234 3.4296875 L 11.910156 3.1523438 L 12.167969 3.3515625 C 12.704744 3.7652412 13.332828 4.009458 14 4.0664062 C 13.853394 2.3728497 12.496236 1.0217701 10.800781 0.88085938 L 10.800781 0.29296875 C 10.800781 0.13176108 10.66902 0 10.507812 0 z M 8.9511719 3.9941406 C 8.4923725 4.296113 7.9859024 4.4966458 7.4511719 4.59375 C 7.431167 5.2022214 7.5701252 5.8096043 7.8652344 6.359375 C 8.6430906 6.0486414 9.2718304 5.4788293 9.6582031 4.7460938 C 9.3933203 4.5266236 9.1544337 4.2745018 8.9511719 3.9941406 z M 12.064453 3.9941406 C 11.861191 4.2747938 11.624404 4.5266236 11.359375 4.7460938 C 11.745894 5.4788293 12.374488 6.0487874 13.152344 6.359375 C 13.447454 5.8097503 13.586411 5.2020753 13.566406 4.59375 C 13.031384 4.4966458 12.523252 4.296259 12.064453 3.9941406 z M 10.134766 5.0878906 C 9.9610006 5.4028589 9.7500984 5.6920202 9.5039062 5.9472656 C 9.6906676 6.5415729 10.031929 7.0786918 10.507812 7.5039062 C 10.983696 7.0788379 11.327057 6.5417189 11.513672 5.9472656 C 11.267188 5.6918742 11.056725 5.4030049 10.882812 5.0878906 C 10.804543 5.1356396 10.724204 5.1821174 10.642578 5.2246094 L 10.507812 5.2949219 L 10.373047 5.2246094 C 10.291421 5.1821172 10.213034 5.1357856 10.134766 5.0878906 z M 9.0292969 6.3671875 C 8.76383 6.5678209 8.4732262 6.7346 8.1601562 6.8671875 C 8.2204631 7.4058605 8.4040916 7.9291609 8.7089844 8.3945312 C 9.1159461 8.1892251 9.471191 7.9098308 9.7636719 7.5761719 C 9.4488496 7.215791 9.1994119 6.8084642 9.0292969 6.3671875 z M 11.988281 6.3671875 C 11.818167 6.8086103 11.56902 7.2157911 11.253906 7.5761719 C 11.546387 7.9098309 11.901778 8.1893711 12.308594 8.3945312 C 12.613486 7.929015 12.797408 7.4057145 12.857422 6.8671875 C 12.544498 6.7346001 12.253748 6.5675289 11.988281 6.3671875 z M 10.177734 7.9882812 C 10.000464 8.1870164 9.8042032 8.3679433 9.5898438 8.5292969 C 9.7879948 9.0263541 10.098076 9.4758671 10.507812 9.8417969 C 10.917839 9.4757213 11.229875 9.0246927 11.427734 8.5273438 C 11.213812 8.3662823 11.016968 8.1867244 10.839844 7.9882812 C 10.790051 8.0313571 10.741733 8.0743484 10.689453 8.1152344 L 10.507812 8.2558594 L 10.328125 8.1152344 C 10.275995 8.0744937 10.227524 8.0312113 10.177734 7.9882812 z M 0 12.023438 L 0 14 L 9.1445312 14 L 9.1445312 12.023438 L 0 12.023438 z "
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9391678;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use stroke

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<path
id="rect1203"
d="M 12.638672 0 L 7.1953125 4.8164062 L 9.2539062 6.875 L 10.636719 6.875 L 10.636719 5.0214844 L 12.308594 5.0214844 L 12.308594 3.1953125 L 12.322266 3.1796875 L 14 3.1796875 L 14 1.3164062 L 13.960938 1.3164062 L 12.638672 0 z M 6.703125 5.2519531 L 5.1816406 6.5976562 L 7.2636719 8.6796875 L 8.6367188 7.1855469 L 6.703125 5.2519531 z M 4.6894531 7.0351562 L 2.6191406 8.8652344 C 2.5604 8.8626797 2.5024072 8.8539738 2.4433594 8.8613281 C 2.3060267 8.8784327 2.1687628 8.9225179 2.0410156 8.9960938 L 0.53320312 9.8652344 C 0.022214468 10.159537 -0.1508474 10.806039 0.14453125 11.316406 L 1.3886719 13.466797 C 1.6840505 13.977164 2.3327613 14.151724 2.84375 13.857422 L 4.3515625 12.988281 C 4.8625512 12.693979 5.035613 12.045524 4.7402344 11.535156 L 4.7011719 11.466797 L 5.4375 10.666016 L 6.9941406 10.666016 L 6.9941406 9.3398438 L 4.6894531 7.0351562 z M 2.4394531 9.6953125 C 2.5013397 9.6876046 2.561885 9.7038936 2.6191406 9.7265625 L 2.8789062 10.005859 L 3.9433594 11.845703 C 4.0455319 12.022241 3.9853464 12.245856 3.8085938 12.347656 L 2.5117188 13.095703 C 2.3349657 13.197503 2.109985 13.137475 2.0078125 12.960938 L 0.86914062 10.992188 C 0.76696811 10.815647 0.82715363 10.590081 1.0039062 10.488281 L 2.3007812 9.7421875 C 2.3449697 9.7167374 2.3919493 9.701229 2.4394531 9.6953125 z "
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.90670317;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use stroke

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<path
id="rect231-1"
d="M 6.6484375 0.00390625 C 5.5413047 0.042041095 4.3646915 0.29389461 2.8671875 1.4140625 L 2.8652344 1.4121094 L 2.8554688 1.421875 C 2.8534608 1.4233816 2.8516185 1.4242716 2.8496094 1.4257812 L 2.8515625 1.4277344 L 1.4414062 2.859375 L 1.75 3.1679688 L 1.2675781 3.6523438 L 0.94921875 3.3320312 L 0 4.2851562 L 1.4355469 5.7265625 L 2.3847656 4.7734375 L 2.078125 4.4648438 L 2.5625 3.9804688 L 12.576172 14 L 14 12.552734 L 4.2890625 2.8359375 C 4.251405 1.4117303 6.6062529 0.40039063 7.7421875 0.40039062 C 7.7444975 0.13678931 7.7460938 0.24593006 7.7460938 0.01171875 C 7.3814942 0.002018925 7.0189646 -0.0088564409 6.6484375 0.00390625 z "
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.47358352;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use stroke

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<path
id="rect4486-7"
d="M 1.1445312 0 L 1.1445312 2.1679688 L 0 2.1679688 L 1.0820312 6.6953125 L 2.265625 6.6953125 L 2.265625 10.818359 L 2.2714844 10.818359 C 2.28877 12.577559 3.7171939 14 5.4804688 14 C 7.2283541 14 8.6421148 12.601201 8.6835938 10.863281 L 8.6972656 10.863281 L 8.6972656 3.140625 L 8.6875 3.140625 A 2.1228261 2.1228261 0 0 1 10.808594 1.0683594 A 2.1228261 2.1228261 0 0 1 12.931641 3.1914062 L 14 3.1914062 C 14 1.4290456 12.570955 -5.5066557e-008 10.808594 0 C 9.0636672 -2.180871e-007 7.6509366 1.4023354 7.6230469 3.140625 L 7.6152344 3.140625 L 7.6152344 10.830078 A 2.1368706 2.1368706 0 0 1 5.4804688 12.923828 A 2.1368706 2.1368706 0 0 1 3.3457031 10.818359 L 3.3476562 10.818359 L 3.3476562 6.6953125 L 4.4199219 6.6953125 L 5.6132812 2.1679688 L 4.4667969 2.1679688 L 4.4667969 0 L 3.5410156 0 L 3.5410156 2.1679688 L 2.0722656 2.1679688 L 2.0722656 0 L 1.1445312 0 z M 12.917969 3.1933594 L 12.917969 14 L 14 14 L 14 3.1933594 L 12.917969 3.1933594 z "
style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.18225479;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use stroke

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@james2432
Copy link
Contributor Author

SVGs are not myself that created them nor do I know how to edit SVGs without messing them up.

I'll look into the other stuff later

@pnorman
Copy link
Collaborator

pnorman commented May 9, 2018

Our SVG requirements are in CONTRIBUTING.md

@Tomasz-W
Copy link

Just for the note: these strokes are only settings, which are placed by Inkscape automatically

@hikemaniac
Copy link
Contributor

hikemaniac commented Sep 6, 2018

I just pushed a PR to @james2432's repo which optimizes the SVGs and removes all the strokes. See james2432#1

@Tomasz-W
Copy link

Tomasz-W commented Sep 6, 2018

@hikemaniac Meanwhile, I fixed icons to pixel aligned versions. See #1697 (comment). Actually I should post this comment in this PR, sorry for inconvenience.

@hikemaniac
Copy link
Contributor

@Tomasz-W This is great! 👍 Sorry, I didn't see the updated icons. Should I update the icons on this PR?

@james2432
Copy link
Contributor Author

might as well, i'll just merge it if theres a PR on my PR(lol)

@hikemaniac
Copy link
Contributor

I submitted another pull request, which updates the icons to the new pixel aligned versions. See james2432#2

@Tomasz-W
Copy link

Tomasz-W commented Sep 8, 2018

@hikemaniac Thanks :) Now we need a test renderings of these icons in amenity-brown. Are you interested in making them?

* Optimized SVGs and removed strokes

* Updated icons to pixel aligned versions
@polarbearing
Copy link
Contributor

Was the colour decided already? amenity-brown would be my least desirable here.
shop-purple makes more sense, e.g. hairdressers have this colour.
office-blue would work as well, in particular as many of them are just the headquarters. You rarely bring your clogged kitchen sink to the plumber, do you?

@Tomasz-W
Copy link

Tomasz-W commented Sep 9, 2018

I think shop-violet might be confusing as we go to "craft" places not to buy some good, but typically to buy some service (for repairing or constructing something), that's why I proposed amenity-brown. Earlier in the discussion I considered also office-blue for the same reason which you mentioned above, so I agree that it could be tested also.

@meased
Copy link
Contributor

meased commented Sep 9, 2018

I'd like to see a test of office blue because it fits the category of "a place of business without a public street front".

@polarbearing
Copy link
Contributor

Consequently you would need to move services like hair dresser, nail studio (currently violet) and car repair (currently brown) to blue. Which might be a good idea.

@kocio-pl
Copy link
Collaborator

But hair dresser, nail studio and car repair are not "a place of business without a public street front". I still think they should be all brown.

@polarbearing
Copy link
Contributor

not ... without

Double negations make the statement hard to read ;-)
Well, probably you can find some property for any pair of two objects that groups them into the same category. How is a public street front defined then?

@dieterdreist
Copy link

dieterdreist commented Sep 11, 2018 via email

@dieterdreist
Copy link

dieterdreist commented Sep 11, 2018 via email

@Adamant36
Copy link
Contributor

@Tomasz-W, you want to give a quick, updated summary on what still needs to be done so I don't have to read through 4 months worth of messages since I wasn't involved in the original discussion? Once I know exactly whats left, I'll get to work on it.

@Tomasz-W
Copy link

Tomasz-W commented Sep 30, 2018

@Adamant36 Sure. Please test these icons in amenity-brown/ office-blue versions:

@matkoniecz
Copy link
Contributor

@james2432 Are you planning to update this PR?

@james2432
Copy link
Contributor Author

yes, I just have to put myself back where I was

@james2432 james2432 closed this Dec 17, 2018
@Adamant36
Copy link
Contributor

James2432, how come you closed it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.