Merge pull request #2607 from Alhadis/master

Add .geojson/.topojson as JSON extensions / Fix NCL colour

lib/linguist/languages.yml

@@ -1545,7 +1545,9 @@ JSON:
   searchable: false
   extensions:
   - .json
+  - .geojson
   - .lock
+  - .topojson
   filenames:
   - .jshintrc
   - composer.lock
@@ -2127,7 +2129,7 @@ Myghty:
 
 NCL:
   type: programming
-  color: #28431f
+  color: "#28431f"
   extensions:
   - .ncl
   tm_scope: source.ncl

samples/JSON/geo.geojson

@@ -0,0 +1,82 @@
+{
+	"type": "FeatureCollection",
+	"features": [
+		{
+			"type": "Feature",
+			"properties": {
+				"name": "Australia Post - North Ryde BC",
+				"geo": [-33.787792, 151.13288],
+				"streetAddress": "11 Waterloo Road",
+				"addressLocality": "Macquarie Park",
+				"addressRegion": "New South Wales",
+				"addressCountry": "Australia",
+				"postalCode": "2113"
+			},
+			"geometry": {
+				"type": "Point",
+				"coordinates": [151.13288, -33.787792, 0]
+			}
+		},
+
+
+		{
+			"type": "Feature",
+			"properties": {
+				"name": "George Weston Foods Limited",
+				"geo": [-37.8263884, 144.9105381],
+				"streetAddress": "Level 3, 187 Todd Road",
+				"addressLocality": "Port Melbourne",
+				"addressRegion": "Victoria",
+				"addressCountry": "Australia",
+				"postalCode": "3207"
+			},
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[144.9097088901841, -37.82622654171794, 0],
+						[144.9099724266943, -37.82679388891783, 0],
+						[144.9110127325916, -37.82651526396403, 0],
+						[144.9112227645738, -37.82655667152123, 0],
+						[144.9113739439796, -37.82618552508767, 0],
+						[144.9112740633105, -37.82615750100924, 0],
+						[144.9111355846674, -37.82584493693527, 0],
+						[144.9097088901841, -37.82622654171794, 0]
+					]
+				]
+			}
+		},
+
+
+		{
+			"type": "Feature",
+			"properties": {
+				"name": "George Weston Foods Limited",
+				"geo": [-37.05202791502396, 144.2085614999388],
+				"streetAddress": "67 Richards Road",
+				"addressLocality": "Castlemaine",
+				"addressRegion": "Victoria",
+				"addressCountry": "Australia",
+				"postalCode": "3450"
+			},
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[144.2052428913937, -37.04906391287216, 0],
+						[144.205540392692,  -37.05049727485623, 0],
+						[144.2059800881858, -37.05066835966983, 0],
+						[144.206490656024,  -37.05279538900776, 0],
+						[144.2064525845008, -37.05366195881602, 0],
+						[144.2084322301922, -37.0538920493147,  0],
+						[144.2084811895712, -37.05266519735124, 0],
+						[144.2079784002005, -37.05041270555773, 0],
+						[144.2074017905817, -37.04817406993293, 0],
+						[144.2061363939852, -37.04834972871226, 0],
+						[144.2052428913937, -37.04906391287216, 0]
+					]
+				]
+			}
+		}
+	]
+}