fix os links for v7 schema (lutraconsulting#61)

OSTranslatorII/metadata.txt

@@ -6,7 +6,7 @@ qgisMinimumVersion=3.4
 qgismaximumversion=3.99
 description=A plugin for loading Ordnance Survey Products.
 about=OS Translator II makes loading GML-based datasets into PostGIS easy. It also performs a number of post-processing tasks on the data such as adding additional fields for styling and downloading 3rd-party stylesheets.
-version=3.2.6
+version=3.2.7
 author=Lutra Consulting
 [email protected]
 
@@ -15,7 +15,9 @@ [email protected]
 # Optional items:
 
 # Uncomment the following line and add your changelog:
-changelog=3.2.5 Bug fixes:
+changelog=3.2.7 Bug fix:
+ - fix download location for v7 styling
+ <p>3.2.5 Bug fixes:
  - applying OS styles
  - cores number to be used (#54)
  <p>3.2.4 Bug fixes:

OSTranslatorII/styler.py

@@ -44,7 +44,7 @@ def populate_locations(self):
         base_url = 'https://raw.githubusercontent.com/OrdnanceSurvey/OS-Master-Map-Topography'
 
         if self.osmm_schema == '7':
-            qml_base = base_url + '/Styling/Stylesheets/Schema%20version%207/Stylesheets/QGIS%20stylesheets%20(QML)/'
+            qml_base = base_url + '/master/Styling/Stylesheets/Schema%20version%207/Stylesheets/QGIS%20stylesheets%20(QML)/'
 
             self.qmlLocations = { 'topographicarea' : qml_base + 'OSMM%20Topo%20-%20Topographic%20Area.qml',
                                   'cartographicsymbol' : qml_base + 'OSMM%20Topo%20-%20Cartographic%20Symbol.qml',
@@ -53,7 +53,7 @@ def populate_locations(self):
                                   'topographicline' : qml_base + 'OSMM%20Topo%20-%20Topographic%20Line.qml',
                                   'topographicpoint' : qml_base + 'OSMM%20Topo%20-%20Topographic%20Point.qml' }
 
-            sql_base = base_url + '/Styling/Stylesheets/Schema%20version%209/SQL/PostGIS/Array/'
+            sql_base = base_url + '/master/Styling/Stylesheets/Schema%20version%207/SQL/PostGIS/Array/'  # should this be version 7?
             sql_mode = '_createtable_array.sql'
             for t in self.styleSupportedTopoTables:
                 self.sqlLocations[t] = sql_base + t + sql_mode