diff --git a/assets/addrs_centroids2.qml b/assets/addrs_centroids2.qml new file mode 100644 index 0000000..1158d2a --- /dev/null +++ b/assets/addrs_centroids2.qml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + diff --git a/assets/buildings.qml b/assets/buildings.qml new file mode 100644 index 0000000..da30c77 --- /dev/null +++ b/assets/buildings.qml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + diff --git a/assets/road_intersections.qml b/assets/road_intersections.qml new file mode 100644 index 0000000..18713cc --- /dev/null +++ b/assets/road_intersections.qml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + diff --git a/osm_sidewalkreator.py b/osm_sidewalkreator.py index 5ac310c..1db5b24 100755 --- a/osm_sidewalkreator.py +++ b/osm_sidewalkreator.py @@ -95,6 +95,13 @@ assets_path = os.path.join(basepath,'assets') +# this two are here because of the dependency structure +# in future they should be moved to generic_functions +def stylepath(filename): + return os.path.join(assets_path,filename) + +def apply_style(layer,filename): + layer.loadNamedStyle(stylepath(filename)) basic_folderpathlist = [temps_path,reports_path,assets_path] for folderpath in basic_folderpathlist: @@ -681,6 +688,8 @@ def data_clean(self): create_fill_id_field(self.splitted_lines) # adding layers to canvas: + apply_style(self.splitted_lines,road_intersections_stylefilename) + self.add_layer_canvas(self.filtered_intersection_points) self.add_layer_canvas(self.splitted_lines) @@ -1792,9 +1801,10 @@ def draw_sidewalks(self): # styling the sidewalks layer - self.sidewalk_stylefile_path = os.path.join(assets_path,sidewalks_stylefilename) + # self.sidewalk_stylefile_path = os.path.join(assets_path,sidewalks_stylefilename) - self.whole_sidewalks.loadNamedStyle(self.sidewalk_stylefile_path) + # self.whole_sidewalks.loadNamedStyle(self.sidewalk_stylefile_path) + apply_style(self.whole_sidewalks,sidewalks_stylefilename) # adding layers to canvas self.add_layer_canvas(self.exclusion_zones) @@ -2232,9 +2242,10 @@ def get_input_feature(self): self.iface.mapCanvas().refresh() # setting a default style for input polygons: - inputpolygons_stylelayerpath = os.path.join(assets_path,inputpolygons_stylefilename) + # inputpolygons_stylelayerpath = os.path.join(assets_path,inputpolygons_stylefilename) - self.input_layer.loadNamedStyle(inputpolygons_stylelayerpath) + # self.input_layer.loadNamedStyle(inputpolygons_stylelayerpath) + apply_style(self.input_layer,inputpolygons_stylefilename) # enabling itens for next step self.dlg.datafetch.setEnabled(True) @@ -2390,6 +2401,7 @@ def call_get_osm_data(self): self.dlg.datafetch_progressbar.setValue(55) if draw_buildings: + apply_style(self.reproj_buildings,buildings_stylefilename) self.add_layer_canvas(self.reproj_buildings) @@ -2459,9 +2471,10 @@ def call_get_osm_data(self): self.POIs_for_splitting_layer.setCrs(self.custom_localTM_crs) - pois_stylepath = os.path.join(assets_path,'addrs_centroids.qml') + # pois_stylepath = os.path.join(assets_path,'addrs_centroids2.qml') - self.POIs_for_splitting_layer.loadNamedStyle(pois_stylepath) + # self.POIs_for_splitting_layer.loadNamedStyle(pois_stylepath) + apply_style(self.POIs_for_splitting_layer,splitting_pois_stylefilename) self.add_layer_canvas(self.POIs_for_splitting_layer) diff --git a/parameters.py b/parameters.py index c436128..0999a77 100644 --- a/parameters.py +++ b/parameters.py @@ -114,6 +114,9 @@ crossings_stylefilename = 'crossings.qml' kerbs_stylefilename = 'kerbs.qml' exclusion_stylefilename = 'exclusion_zones.qml' +splitting_pois_stylefilename = 'addrs_centroids2.qml' +buildings_stylefilename = 'buildings.qml' +road_intersections_stylefilename = 'road_intersections.qml'