Module:Road data/strings/CAN/SK and Module:Road data/strings/CAN/SK/sandbox: Difference between pages

Content deleted Content added

@@ Line 30: / Line 30: @@
 		}
 	},
-	shieldmain = {
-		["1"] = "Saskatchewan Highway 1.svg",
-		["2"] = {"Saskatchewan Highway %route% (jct).svg", "CanAm Highway.svg"},
-		["3"] = {"Saskatchewan Highway %route% (jct).svg", "CanAm Highway.svg"},
-		["6"] = {"Saskatchewan Highway %route% (jct).svg", "CanAm Highway.svg"},
-		["11"] = {"Saskatchewan Highway %route% (jct).svg", "Louis Riel Trail.svg"},
-		["16"] = {"Saskatchewan Highway %route%.svg", "Yellowhead Highway (Saskatchewan).svg"},
-		["16A"] = "Saskatchewan Highway 16A.svg",
-		["16B"] = "Saskatchewan Highway 16B.svg",
-		["35"] = {"Saskatchewan Highway %route% (jct).svg", "CanAm Highway.svg"},
-		["39"] = {"Saskatchewan Highway %route% (jct).svg", "CanAm Highway.svg"},
-		["49"] = {"Saskatchewan Highway %route% (jct).svg", "Manitoba Highway %route%.svg"},
-		["57"] = {"Saskatchewan Highway %route% (jct).svg", "Manitoba Highway %route%.svg"},
-		["Circle"] = {"Saskatchewan Highway 11 (jct).svg", "Saskatchewan Highway 16.svg"},
-		default = {
-			ifexists = true,
-			default = "Saskatchewan Highway %route% (jct).svg"
-		}
-	},
-	name = {
-		default = "Highway %route%",
-		["Circle"] = "Circle Drive"
-	},
 	link = {
 		default = "[dab||%dab%|Saskatchewan Highway %route%]",
@@ Line 61: / Line 39: @@
 	abbr = {
 		["Circle"] = "Circle Drive",
-		default = "Highway %route%"
+		default = "Hwy %route%"
 	},
-	orientation = "upright"
 }
@@ Line 69: / Line 46: @@
 SK.Hwy = SK.SK
+SK.TCH = {
-for k, v in pairs(SK) do if k:find ("TCH") then
-	v.shield = SK.SK.shield
+	shield = SK.SK.shield,
+	link = "Saskatchewan Highway %route%",
-	v.name = SK.SK.name
+	abbr = SK.SK.abbr.default .. " (TCH)"
-	v.link = "Saskatchewan Highway %route%"
+}
-	v.abbr = SK.SK.abbr.default .. " (TCH)"
-	v.orientation = "upright"
-	end
-end
+SK.AB = {alias = {module = "CAN/AB", type = "Hwy", width = "expand"}}
-SK.YH = {
-	shield = {SK.Hwy.shield,"Yellowhead Blank.svg"},
-	shieldmain = SK.Hwy.shieldmain,
-	name = SK.Hwy.name,
-	link = SK.Hwy.link,
-	abbr = {
-		["16"] = "Highway&nbsp;%route% (TCH/YH)",
-		default = SK.Hwy.abbr.default .. " (YH)"
-		},
-	orientation = "upright"
-	}
+SK.MB = {alias = {module = "CAN/MB", type = "Hwy"}}
--- add new types above this line if you want it to have the provincial highway browse and maint
-for k, v in pairs(SK) do if k:find ("^%a") then
+local function municipal(args)
-	v.maint = "[[Ministry of Highways and Infrastructure (Saskatchewan)|Ministry of Highways and Infrastructure]]"
+	local banner = "Saskatchewan Rural Municipal Route.svg"
-	end
+	local shield = "Saskatchewan Route %route%.svg"
+	local container = mw.html.create('p'):cssText("width:100%; margin:0; text-align:center; background:none; border-collapse:collapse;")
+			container:tag('p'):wikitext(banner)
+			container:tag('p'):wikitext(shield)
+		return tostring(container)
 end
-SK.AB = {alias = {module = "CAN/AB", type = "Hwy", width = "expand"}}
-SK.MB = {alias = {module = "CAN/MB", type = "Hwy"}}
 SK.Mun = {
-	shield = "Saskatchewan Route %route%.svg",
+	shield = "Saskatchewan Rural Municipal Route.svg",
+	shieldmain = municipal,
-	name = SK.SK.name.default,
 	link = SK.SK.link,
-	abbr = SK.SK.abbr,
+	abbr = SK.SK.abbr
-	banner = "Saskatchewan Rural Municipal Route.svg",
-	orientation = "upright"
 }
-SK.Tertiary = SK.Mun --shields are superimposed
+SK.Tertiary = SK.SK --shields are superimposed
 return SK