Skip to content

Commit

Permalink
Fix bug with pictogram displaying in the box allowing to choose them …
Browse files Browse the repository at this point in the history
…+ prepare for 0.5.5
  • Loading branch information
mz committed Oct 12, 2017
1 parent 5476263 commit 3c6d153
Show file tree
Hide file tree
Showing 10 changed files with 970 additions and 1,057 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changes
=======

0.5.5 (2017-10-12)
------------------

- Fix bug with pictogram displaying in the appropriate box.


0.5.4 (2017-10-01)
------------------
Expand Down
2 changes: 1 addition & 1 deletion magrit_app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

__version__ = '0.5.4'
__version__ = '0.5.5'

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion magrit_app/static/js/interface.js
Original file line number Diff line number Diff line change
Expand Up @@ -2104,7 +2104,7 @@ function prepare_available_symbols() {
return xhrequest('GET', 'static/json/list_symbols.json', null)
.then((result) => {
const list_res = JSON.parse(result);
return Promise.all(list_res.map(name => getImgDataUrl(`stiatelab/magritatic/img/svg_symbols/${name}`)))
return Promise.all(list_res.map(name => getImgDataUrl(`static/img/svg_symbols/${name}`)))
.then((symbols) => {
for (let i = 0; i < list_res.length; i++) {
default_symbols.push([list_res[i], symbols[i]]);
Expand Down
2 changes: 1 addition & 1 deletion magrit_app/static/json/list_symbols.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["city_large.png","city_small.png","parking.png","fountain.png","gas.png","tourist_view_point.png","phone.png","amenity=restaurant.png","car.png","tourist_museum.png","education_university.png","food_fastfood.png","city_building.png","landuse_coniferous.png","skull.png","landuse_grass.png","parachute.png","food_drinkingtap.png","tourist_cinema.png","boat.png","disability_accessibility.png","question.png","tourist_steam_train.png","deer.png","landuse_swamp.png","disability_lowvision.png","poi_place_city.png","poi_place_town.png","tourist_memorial.png","tourist_fountain.png","tourist_casino.png","amenity=bar.png","education_school.png","poi_tower_communications.png","house.png","tourist_ruin.png","plane.png","amenity=fire_station.png","poi_embassy2.png","golf.png","tourist_zoo.png","bank.png","amenity=hospital.png","tourist_theatre.png","tourist_castle.png","food_pub.png","cross.png","amenity=pub.png","landuse_coniferous_and_deciduous.png","couple.png","fish.png","tourisum_fountain.png","poi_embassy.png","landuse_quary.png","tourist_windmill.png","tourist_archaeological.png","poi_tower_power.png","poi_peak.png","tourist_waterwheel.png","teepee.png","food_cafe.png","tourist_monument.png","city_medium.png","poi_cave.png","shipwreck.png","poi_mine.png","amenity=fast_food.png","tourist_picnic.png","amenity=theatre.png","poi_point_of_interest.png","swimmer.png","landuse_deciduous.png","tourist_battlefield.png","education_nursery.png","tourist_wreck.png","skier.png","amenity=police.png","poi_tower_water.png","poi_military_bunker.png","camera.png","poi_boundary_administrative.png","tourist_beach.png","landuse_hills.png","poi_place_village.png","tourist_art_gallery2.png","food_bar.png","anchor.png","waypoint.png","walker.png","landuse_scrub.png","h.png","flag.png"]
["amenity=pub.png","anchor.png","phone.png","tourist_picnic.png","education_nursery.png","tourist_cinema.png","fountain.png","tourist_archaeological.png","disability_accessibility.png","golf.png","gas.png","tourisum_fountain.png","landuse_swamp.png","amenity=hospital.png","food_cafe.png","car.png","landuse_grass.png","poi_place_town.png","fish.png","tourist_memorial.png","landuse_scrub.png","tourist_art_gallery2.png","house.png","poi_military_bunker.png","amenity=police.png","amenity=restaurant.png","tourist_zoo.png","skull.png","poi_tower_water.png","poi_cave.png","amenity=fire_station.png","tourist_windmill.png","tourist_museum.png","poi_boundary_administrative.png","landuse_coniferous.png","education_university.png","tourist_wreck.png","poi_embassy.png","plane.png","food_bar.png","h.png","swimmer.png","poi_mine.png","tourist_monument.png","poi_place_city.png","tourist_view_point.png","poi_place_village.png","city_small.png","city_building.png","flag.png","tourist_casino.png","education_school.png","tourist_theatre.png","poi_embassy2.png","tourist_castle.png","skier.png","landuse_hills.png","tourist_ruin.png","city_large.png","amenity=bar.png","poi_tower_communications.png","tourist_fountain.png","teepee.png","waypoint.png","parachute.png","couple.png","poi_tower_power.png","food_drinkingtap.png","camera.png","city_medium.png","question.png","landuse_deciduous.png","tourist_beach.png","amenity=theatre.png","food_pub.png","tourist_battlefield.png","shipwreck.png","disability_lowvision.png","walker.png","boat.png","poi_point_of_interest.png","amenity=fast_food.png","poi_peak.png","cross.png","landuse_coniferous_and_deciduous.png","tourist_waterwheel.png","landuse_quary.png","parking.png","tourist_steam_train.png","bank.png","deer.png","food_fastfood.png"]
4 changes: 2 additions & 2 deletions magrit_app/templates/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title> {{ app_name }} </title>
<link rel="icon" type="image/png" href="static/img/favicon.png" />
<link href="static/css/scoped-bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="static/css/style.a54f919159af.min.css" rel="stylesheet" type="text/css">
<link href="static/css/style.3e43df99730a.min.css" rel="stylesheet" type="text/css">
<link href="static/css/_vanilla-dataTables.min.css" rel="stylesheet" type="text/css">
<link href="static/css/alertify.min.css" rel="stylesheet" type="text/css">
<link href="static/css/semantic.min.css" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -51,6 +51,6 @@
</div>
</noscript>
<script src="static/js/lib/bootstrap-native3.mod.min.js"></script>
<script src="static/js/app.a54f919159af.js"></script>
<script src="static/js/app.3e43df99730a.js"></script>
</body>
</html>

0 comments on commit 3c6d153

Please sign in to comment.