Add icon for building=container.

map_machine/icons/config.json

@@ -18,6 +18,7 @@
       "apartments_5_story_skillion_roof": {"name": "five-story apartments building with skillion roof", "categories": ["building"]},
       "building": {"name": "house", "categories": ["building"]},
       "building_construction": {"name": "building construction", "categories": ["building"]},
+      "building_container": {"name": "container building", "categories": ["building"]},
       "fort": {"name": "fort", "categories": ["building"]},
       "mausoleum": {"name": "mausoleum", "categories": ["building"]},
       "minaret": {"name": "minaret", "categories": ["building"]},

map_machine/icons/icons.svg

@@ -151,9 +151,9 @@
      showgrid="false"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="346.25001"
-     inkscape:cx="684.50003"
-     inkscape:zoom="3.9999998"
+     inkscape:cy="162.84419"
+     inkscape:cx="380.37429"
+     inkscape:zoom="13.184382"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -29088,8 +29088,8 @@
        id="circle136442"
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
-       id="rect136444"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0000ff;stroke:none;stroke-width:0.0999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="building_container"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;stroke:none;stroke-width:0.0999997;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 690.5,307 c -0.277,0 -0.5,0.223 -0.5,0.5 v 5 c 0,0.277 0.223,0.5 0.5,0.5 h 7.5 v -2.5 c 0,-0.277 0.223,-0.5 0.5,-0.5 h 1 c 0.277,0 0.5,0.223 0.5,0.5 v 2.5 h 1.5 c 0.277,0 0.5,-0.223 0.5,-0.5 v -5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 2,2 h 3 c 0.277,0 0.5,0.223 0.5,0.5 v 1 c 0,0.277 -0.223,0.5 -0.5,0.5 h -3 c -0.277,0 -0.5,-0.223 -0.5,-0.5 v -1 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2.5,5 v 1 1 h 2 v -1 h 3 v 1 h 2 v -1 h 3 v 1 h 2 v -2 h -5 -2 z" />
     <path
        id="rect136458"
@@ -30685,11 +30685,11 @@
        sodipodi:open="true" />
     <path
        id="circle24593"
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
        d="M 357.5 146 A 0.50005 0.50005 0 0 0 357 146.5 L 357 148.0293 C 354.75486 148.2794 353 150.18977 353 152.5 C 353 154.97936 355.02064 157 357.5 157 C 359.97936 157 362 154.97936 362 152.5 C 362 150.18977 360.24514 148.2794 358 148.0293 L 358 147 L 358.5 147 A 0.5 0.5 0 0 0 359 146.5 A 0.5 0.5 0 0 0 358.5 146 L 357.5 146 z M 359.5 147 A 0.5 0.5 0 0 0 359 147.5 A 0.5 0.5 0 0 0 359.5 148 L 360.66211 148 C 361.9951 148.93569 362.84541 150.4121 362.98242 152.03711 A 0.49999949 0.49999949 0 0 0 363.52344 152.49414 A 0.49999949 0.49999949 0 0 0 363.97852 151.95312 C 363.84198 150.33386 363.10394 148.83824 361.93164 147.74609 A 0.5 0.5 0 0 0 362 147.5 A 0.5 0.5 0 0 0 361.5 147 L 359.5 147 z M 357 149.03711 L 357 152 L 356.5 152 A 0.5 0.5 0 0 0 356 152.5 A 0.5 0.5 0 0 0 356.5 153 L 357.5 153 L 358.5 153 A 0.50005 0.50005 0 0 0 358.5 152 L 358 152 L 358 149.03711 C 359.70061 149.27817 361 150.73077 361 152.5 C 361 154.43892 359.43892 156 357.5 156 C 355.56108 156 354 154.43892 354 152.5 C 354 150.73077 355.29939 149.27817 357 149.03711 z M 364 153 C 362.90135 153 362 153.90135 362 155 C 362 156.09865 362.90135 157 364 157 C 365.09865 157 366 156.09865 366 155 C 366 153.90135 365.09865 153 364 153 z M 364 154 C 364.55821 154 365 154.44179 365 155 C 365 155.55821 364.55821 156 364 156 C 363.44179 156 363 155.55821 363 155 C 363 154.44179 363.44179 154 364 154 z " />
     <path
        id="circle24911"
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
        d="M 373.5 146 A 0.50005 0.50005 0 0 0 373 146.5 L 373 148.0293 C 370.75486 148.2794 369 150.18977 369 152.5 C 369 154.97936 371.02064 157 373.5 157 C 375.97936 157 378 154.97936 378 152.5 C 378 150.18977 376.24514 148.2794 374 148.0293 L 374 147 L 374.5 147 A 0.5 0.5 0 0 0 375 146.5 A 0.5 0.5 0 0 0 374.5 146 L 373.5 146 z M 376 147 A 0.5 0.5 0 0 0 375.5 147.5 A 0.5 0.5 0 0 0 376 148 L 376.66211 148 C 377.9951 148.93569 378.84541 150.4121 378.98242 152.03711 A 0.49999949 0.49999949 0 0 0 379.52344 152.49414 A 0.49999949 0.49999949 0 0 0 379.97852 151.95312 C 379.85227 150.45587 379.21191 149.06473 378.18945 148 L 378.5 148 A 0.5 0.5 0 0 0 379 147.5 A 0.5 0.5 0 0 0 378.5 147 L 376 147 z M 373 149.03711 L 373 152.5 A 0.5 0.5 0 0 0 373.5 153 A 0.5 0.5 0 0 0 374 152.5 L 374 149.03711 C 375.70061 149.27817 377 150.73077 377 152.5 C 377 154.43892 375.43892 156 373.5 156 C 371.56108 156 370 154.43892 370 152.5 C 370 150.73077 371.29939 149.27817 373 149.03711 z M 380 153 C 378.90135 153 378 153.90135 378 155 C 378 156.09865 378.90135 157 380 157 C 381.09865 157 382 156.09865 382 155 C 382 153.90135 381.09865 153 380 153 z M 380 154 C 380.55821 154 381 154.44179 381 155 C 381 155.55821 380.55821 156 380 156 C 379.44179 156 379 155.55821 379 155 C 379 154.44179 379.44179 154 380 154 z " />
     <circle
        style="opacity:0.2;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -30779,15 +30779,15 @@
        r="2" />
     <path
        id="circle37019"
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
        d="M 422.48047 148 A 0.50005 0.50005 0 0 0 422.22266 148.08398 L 419.34766 150 L 418.5 150 A 0.5 0.5 0 0 0 418 150.5 A 0.5 0.5 0 0 0 418.5 151 L 419.5 151 C 420.13889 151 420.53432 151.20145 421.10938 151.45703 C 421.68444 151.71261 422.41667 152 423.5 152 C 424.58333 152 425.31557 151.71261 425.89062 151.45703 C 426.46569 151.20145 426.86111 151 427.5 151 L 428.5 151 A 0.5 0.5 0 0 0 429 150.5 A 0.5 0.5 0 0 0 428.5 150 L 427.5 150 C 426.63889 150 426.03432 150.29855 425.48438 150.54297 C 424.93444 150.78739 424.41667 151 423.5 151 C 422.58333 151 422.06557 150.78739 421.51562 150.54297 C 421.28906 150.44227 421.0522 150.33269 420.79297 150.23828 L 422.43555 149.14258 L 422.64648 149.35352 A 0.5 0.5 0 0 0 423.35352 149.35352 A 0.5 0.5 0 0 0 423.35352 148.64648 L 422.85352 148.14648 A 0.50005 0.50005 0 0 0 422.48047 148 z M 419.5 152 C 418.12521 152 417 153.12521 417 154.5 C 417 155.87479 418.12521 157 419.5 157 C 420.87479 157 422 155.87479 422 154.5 C 422 153.12521 420.87479 152 419.5 152 z M 427.5 152 C 426.12521 152 425 153.12521 425 154.5 C 425 155.87479 426.12521 157 427.5 157 C 428.87479 157 430 155.87479 430 154.5 C 430 153.12521 428.87479 152 427.5 152 z M 419.5 153 C 420.33435 153 421 153.66565 421 154.5 C 421 155.33435 420.33435 156 419.5 156 C 418.66565 156 418 155.33435 418 154.5 C 418 153.66565 418.66565 153 419.5 153 z M 427.5 153 C 428.33435 153 429 153.66565 429 154.5 C 429 155.33435 428.33435 156 427.5 156 C 426.66565 156 426 155.33435 426 154.5 C 426 153.66565 426.66565 153 427.5 153 z " />
     <path
        id="circle41493"
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
        d="M 389 148 A 0.50005 0.50005 0 0 0 388.52539 148.3418 L 388.02539 149.8418 A 0.50005 0.50005 0 0 0 388.5 150.5 C 389.77448 150.5 391.05616 151.30747 391.51172 153.10742 A 0.5 0.5 0 0 0 391.57617 153.26367 A 0.5 0.5 0 0 0 391.57617 153.26562 A 0.5 0.5 0 0 0 391.58008 153.26953 A 0.5 0.5 0 0 0 391.67188 153.37305 A 0.5 0.5 0 0 0 391.69336 153.39062 A 0.5 0.5 0 0 0 391.74219 153.42969 A 0.5 0.5 0 0 0 391.79883 153.45508 A 0.5 0.5 0 0 0 391.82227 153.46484 A 0.5 0.5 0 0 0 391.96484 153.49805 A 0.5 0.5 0 0 0 392.17383 153.4668 A 0.5 0.5 0 0 0 392.22656 153.44531 A 0.5 0.5 0 0 0 392.27344 153.41797 A 0.5 0.5 0 0 0 392.31836 153.38281 A 0.5 0.5 0 0 0 392.35938 153.3457 A 0.5 0.5 0 0 0 392.41016 153.2832 A 0.5 0.5 0 0 0 392.42969 153.25781 L 393.78516 151 L 395 151 A 0.5 0.5 0 0 0 395.5 150.5 A 0.5 0.5 0 0 0 395 150 L 393 150 A 0.5 0.5 0 0 0 392.5 150.5 A 0.5 0.5 0 0 0 392.68359 150.88672 L 392.10156 151.85742 C 391.45213 150.60857 390.31361 149.93109 389.12109 149.7207 L 389.36133 149 L 390.5 149 A 0.5 0.5 0 0 0 391 148.5 A 0.5 0.5 0 0 0 390.5 148 L 389 148 z M 388 151 C 386.34907 151 385 152.34907 385 154 C 385 155.65093 386.34907 157 388 157 C 389.65093 157 391 155.65093 391 154 C 391 152.34907 389.65093 151 388 151 z M 388 152 C 389.11049 152 390 152.88951 390 154 C 390 155.11049 389.11049 156 388 156 C 386.88951 156 386 155.11049 386 154 C 386 152.88951 386.88951 152 388 152 z M 395.5 152 C 394.12521 152 393 153.12521 393 154.5 C 393 155.87479 394.12521 157 395.5 157 C 396.87479 157 398 155.87479 398 154.5 C 398 153.12521 396.87479 152 395.5 152 z M 395.5 153 C 396.33435 153 397 153.66565 397 154.5 C 397 155.33435 396.33435 156 395.5 156 C 394.66565 156 394 155.33435 394 154.5 C 394 153.66565 394.66565 153 395.5 153 z " />
     <path
        id="circle41503"
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
        d="M 403.5 149 A 0.50005 0.50005 0 0 0 403 149.5 L 403 151 A 0.50005 0.50005 0 0 0 403.5 151.5 C 404.19444 151.5 404.69722 151.60739 405.16016 151.91602 C 405.62309 152.22464 406.0751 152.76738 406.55273 153.72266 A 0.5 0.5 0 0 0 406.55859 153.73047 A 0.5 0.5 0 0 0 406.63281 153.83594 A 0.5 0.5 0 0 0 406.64453 153.85156 A 0.5 0.5 0 0 0 406.64648 153.85352 A 0.5 0.5 0 0 0 406.76367 153.93945 A 0.5 0.5 0 0 0 406.79492 153.95117 A 0.5 0.5 0 0 0 406.90039 153.98633 A 0.5 0.5 0 0 0 406.94531 153.99219 A 0.5 0.5 0 0 0 407 154 L 408.03711 154 C 408.28131 155.69166 409.74278 157 411.5 157 C 413.42707 157 415 155.42707 415 153.5 C 415 151.57293 413.42707 150 411.5 150 C 409.74278 150 408.28131 151.30834 408.03711 153 L 407.30273 153 C 407.09788 152.61827 406.88815 152.28622 406.66797 152 L 407.5 152 A 0.5 0.5 0 0 0 408 151.5 A 0.5 0.5 0 0 0 407.5 151 L 405.57617 151 C 405.09556 150.73292 404.54881 150.68187 404 150.63086 L 404 150 L 405 150 A 0.5 0.5 0 0 0 405.5 149.5 A 0.5 0.5 0 0 0 405 149 L 403.5 149 z M 411.5 151 C 412.88663 151 414 152.11337 414 153.5 C 414 154.88663 412.88663 156 411.5 156 C 410.28458 156 409.27859 155.14505 409.04883 154 L 411.5 154 A 0.5 0.5 0 0 0 412 153.5 A 0.5 0.5 0 0 0 411.5 153 L 409.04883 153 C 409.27859 151.85495 410.28458 151 411.5 151 z M 403.5 152 C 402.12521 152 401 153.12521 401 154.5 C 401 155.87479 402.12521 157 403.5 157 C 404.87479 157 406 155.87479 406 154.5 C 406 153.12521 404.87479 152 403.5 152 z M 403.5 153 C 404.33435 153 405 153.66565 405 154.5 C 405 155.33435 404.33435 156 403.5 156 C 402.66565 156 402 155.33435 402 154.5 C 402 153.66565 402.66565 153 403.5 153 z " />
     <circle
        style="opacity:0.2;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -30814,20 +30814,8 @@
        cy="138.5"
        r="2" />
     <path
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
-       d="m 444.5,152 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
-       id="circle41949" />
-    <path
-       style="color:#000000;fill:#0000ff;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;opacity:1"
-       d="m 438.31445,148.03516 -5,2 a 0.5,0.5 0 0 0 -0.27929,0.65039 0.5,0.5 0 0 0 0.65039,0.27929 l 5,-2 a 0.5,0.5 0 0 0 0.27929,-0.65039 0.5,0.5 0 0 0 -0.65039,-0.27929 z"
-       id="path41951" />
-    <path
-       style="color:#000000;fill:#0000ff;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none;opacity:1"
-       d="m 433.5,150 a 0.5,0.5 0 0 0 -0.5,0.5 0.5,0.5 0 0 0 0.5,0.5 h 11 a 0.5,0.5 0 0 0 0.5,-0.5 0.5,0.5 0 0 0 -0.5,-0.5 z"
-       id="path41953" />
-    <path
-       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1"
-       d="m 435.5,152 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
-       id="circle41955" />
+       id="path9852"
+       style="color:#000000;fill:#0000ff;-inkscape-stroke:none;opacity:1;stroke:none"
+       d="M 438.4668 148 A 0.5 0.5 0 0 0 438.31445 148.03516 L 433.31445 150.03516 A 0.5 0.5 0 0 0 433.30859 150.03711 A 0.5 0.5 0 0 0 433.28906 150.05078 A 0.5 0.5 0 0 0 433.16016 150.13672 A 0.5 0.5 0 0 0 433.12891 150.17383 A 0.5 0.5 0 0 0 433.05664 150.28125 A 0.5 0.5 0 0 0 433.03125 150.33984 A 0.5 0.5 0 0 0 433.00781 150.46484 A 0.5 0.5 0 0 0 433 150.5 A 0.5 0.5 0 0 0 433.00195 150.51172 A 0.5 0.5 0 0 0 433.03516 150.68555 A 0.5 0.5 0 0 0 433.03711 150.6875 A 0.5 0.5 0 0 0 433.05078 150.71094 A 0.5 0.5 0 0 0 433.13672 150.83984 A 0.5 0.5 0 0 0 433.17383 150.87109 A 0.5 0.5 0 0 0 433.28125 150.94336 A 0.5 0.5 0 0 0 433.33984 150.96875 A 0.5 0.5 0 0 0 433.46484 150.99219 A 0.5 0.5 0 0 0 433.5 151 L 433.5332 151 L 444.5 151 A 0.5 0.5 0 0 0 445 150.5 A 0.5 0.5 0 0 0 444.5 150 L 436.09766 150 L 438.68555 148.96484 A 0.5 0.5 0 0 0 438.96484 148.31445 A 0.5 0.5 0 0 0 438.4668 148 z M 435.5 152 C 434.12521 152 433 153.12521 433 154.5 C 433 155.87479 434.12521 157 435.5 157 C 436.87479 157 438 155.87479 438 154.5 C 438 153.12521 436.87479 152 435.5 152 z M 444.5 152 C 443.12521 152 442 153.12521 442 154.5 C 442 155.87479 443.12521 157 444.5 157 C 445.87479 157 447 155.87479 447 154.5 C 447 153.12521 445.87479 152 444.5 152 z M 435.5 153 C 436.33435 153 437 153.66565 437 154.5 C 437 155.33435 436.33435 156 435.5 156 C 434.66565 156 434 155.33435 434 154.5 C 434 153.66565 434.66565 153 435.5 153 z M 444.5 153 C 445.33435 153 446 153.66565 446 154.5 C 446 155.33435 445.33435 156 444.5 156 C 443.66565 156 443 155.33435 443 154.5 C 443 153.66565 443.66565 153 444.5 153 z " />
   </g>
 </svg>

map_machine/scheme/default.yml

@@ -442,8 +442,6 @@ node_icons:
     - tags: {amenity: police}
       location_restrictions: {include: [jp]}
       shapes: [japan_koban]
-    - tags: {building: construction}
-      shapes: [building_construction]
     - tags: {building: townhall}
       shapes: [townhall]
     - tags: {amenity: townhall}
@@ -765,6 +763,11 @@ node_icons:
   - group: "Big objects not for all"
     start_zoom_level: 15.0
     tags:
+    - tags: {building: construction}
+      shapes: [building_construction]
+    - tags: {building: container}
+      shapes: [building_container]
+
     - tags: {building: apartments}
       shapes: [apartments_2_story]