GUI2 Updated unit tests for errors relating to topojson testing
Change-Id: Ic6c15ad3e5f9bd18cdb1e64955bc5cec7c8e048c
diff --git a/apps/faultmanagement/fm-gui2-lib/package-lock.json b/apps/faultmanagement/fm-gui2-lib/package-lock.json
index dd03e0e..3fc1266 100644
--- a/apps/faultmanagement/fm-gui2-lib/package-lock.json
+++ b/apps/faultmanagement/fm-gui2-lib/package-lock.json
@@ -376,7 +376,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.2.4",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -2272,7 +2272,7 @@
"anymatch": "2.0.0",
"async-each": "1.0.1",
"braces": "2.3.2",
- "fsevents": "1.2.4",
+ "fsevents": "1.2.9",
"glob-parent": "3.1.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -4486,14 +4486,14 @@
"dev": true
},
"fsevents": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
- "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+ "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
"dev": true,
"optional": true,
"requires": {
- "nan": "2.11.1",
- "node-pre-gyp": "0.10.0"
+ "nan": "2.14.0",
+ "node-pre-gyp": "0.12.0"
},
"dependencies": {
"abbrev": {
@@ -4514,7 +4514,7 @@
"optional": true
},
"are-we-there-yet": {
- "version": "1.1.4",
+ "version": "1.1.5",
"bundled": true,
"dev": true,
"optional": true,
@@ -4538,7 +4538,7 @@
}
},
"chownr": {
- "version": "1.0.1",
+ "version": "1.1.1",
"bundled": true,
"dev": true,
"optional": true
@@ -4565,16 +4565,16 @@
"optional": true
},
"debug": {
- "version": "2.6.9",
+ "version": "4.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "2.1.1"
}
},
"deep-extend": {
- "version": "0.5.1",
+ "version": "0.6.0",
"bundled": true,
"dev": true,
"optional": true
@@ -4597,7 +4597,7 @@
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "2.3.5"
}
},
"fs.realpath": {
@@ -4619,11 +4619,11 @@
"signal-exit": "3.0.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "wide-align": "1.1.3"
}
},
"glob": {
- "version": "7.1.2",
+ "version": "7.1.3",
"bundled": true,
"dev": true,
"optional": true,
@@ -4643,7 +4643,7 @@
"optional": true
},
"iconv-lite": {
- "version": "0.4.21",
+ "version": "0.4.24",
"bundled": true,
"dev": true,
"optional": true,
@@ -4709,21 +4709,21 @@
"dev": true
},
"minipass": {
- "version": "2.2.4",
+ "version": "2.3.5",
"bundled": true,
"dev": true,
"requires": {
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
}
},
"minizlib": {
- "version": "1.1.0",
+ "version": "1.2.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "2.3.5"
}
},
"mkdirp": {
@@ -4735,38 +4735,45 @@
}
},
"ms": {
- "version": "2.0.0",
+ "version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
},
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "dev": true,
+ "optional": true
+ },
"needle": {
- "version": "2.2.0",
+ "version": "2.3.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
- "iconv-lite": "0.4.21",
+ "debug": "4.1.1",
+ "iconv-lite": "0.4.24",
"sax": "1.2.4"
}
},
"node-pre-gyp": {
- "version": "0.10.0",
+ "version": "0.12.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
- "needle": "2.2.0",
+ "needle": "2.3.0",
"nopt": "4.0.1",
- "npm-packlist": "1.1.10",
+ "npm-packlist": "1.4.1",
"npmlog": "4.1.2",
- "rc": "1.2.7",
- "rimraf": "2.6.2",
- "semver": "5.5.0",
- "tar": "4.4.1"
+ "rc": "1.2.8",
+ "rimraf": "2.6.3",
+ "semver": "5.7.0",
+ "tar": "4.4.8"
}
},
"nopt": {
@@ -4780,19 +4787,19 @@
}
},
"npm-bundled": {
- "version": "1.0.3",
+ "version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true
},
"npm-packlist": {
- "version": "1.1.10",
+ "version": "1.4.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ignore-walk": "3.0.1",
- "npm-bundled": "1.0.3"
+ "npm-bundled": "1.0.6"
}
},
"npmlog": {
@@ -4801,7 +4808,7 @@
"dev": true,
"optional": true,
"requires": {
- "are-we-there-yet": "1.1.4",
+ "are-we-there-yet": "1.1.5",
"console-control-strings": "1.1.0",
"gauge": "2.7.4",
"set-blocking": "2.0.0"
@@ -4861,12 +4868,12 @@
"optional": true
},
"rc": {
- "version": "1.2.7",
+ "version": "1.2.8",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "deep-extend": "0.5.1",
+ "deep-extend": "0.6.0",
"ini": "1.3.5",
"minimist": "1.2.0",
"strip-json-comments": "2.0.1"
@@ -4890,22 +4897,22 @@
"inherits": "2.0.3",
"isarray": "1.0.0",
"process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
+ "safe-buffer": "5.1.2",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
}
},
"rimraf": {
- "version": "2.6.2",
+ "version": "2.6.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "7.1.3"
}
},
"safe-buffer": {
- "version": "5.1.1",
+ "version": "5.1.2",
"bundled": true,
"dev": true
},
@@ -4922,7 +4929,7 @@
"optional": true
},
"semver": {
- "version": "5.5.0",
+ "version": "5.7.0",
"bundled": true,
"dev": true,
"optional": true
@@ -4955,7 +4962,7 @@
"dev": true,
"optional": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "5.1.2"
}
},
"strip-ansi": {
@@ -4973,18 +4980,18 @@
"optional": true
},
"tar": {
- "version": "4.4.1",
+ "version": "4.4.8",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "chownr": "1.0.1",
+ "chownr": "1.1.1",
"fs-minipass": "1.2.5",
- "minipass": "2.2.4",
- "minizlib": "1.1.0",
+ "minipass": "2.3.5",
+ "minizlib": "1.2.1",
"mkdirp": "0.5.1",
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
}
},
"util-deprecate": {
@@ -4994,7 +5001,7 @@
"optional": true
},
"wide-align": {
- "version": "1.1.2",
+ "version": "1.1.3",
"bundled": true,
"dev": true,
"optional": true,
@@ -5008,7 +5015,7 @@
"dev": true
},
"yallist": {
- "version": "3.0.2",
+ "version": "3.0.3",
"bundled": true,
"dev": true
}
@@ -5227,8 +5234,8 @@
"dev": true
},
"gui2-fw-lib": {
- "version": "file:../../../web/gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.0.tgz",
- "integrity": "sha512-UF/S6N4eNo3lrIRE9B/5WrGvq84tyfeClW3TKj2ftbTXpoNSiNcjLWYHiueR8dqPhh68AeEx97iVXkg9hU7BkQ==",
+ "version": "file:../../../web/gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "integrity": "sha512-667z5UF7smRugLD3muYVzs4jXPCZ8JBAde8YTwixoS1btVs6YzGPu4NXMUxdxJn/JbpRf6YXcnfRTgPmSQRX9w==",
"requires": {
"tslib": "1.9.3"
}
@@ -6779,7 +6786,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.2.4",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
diff --git a/apps/faultmanagement/fm-gui2-lib/package.json b/apps/faultmanagement/fm-gui2-lib/package.json
index dd34dda..b41f358 100644
--- a/apps/faultmanagement/fm-gui2-lib/package.json
+++ b/apps/faultmanagement/fm-gui2-lib/package.json
@@ -14,7 +14,7 @@
"@angular/router": "^7.0.2",
"core-js": "^2.5.4",
"d3": "^5.2.0",
- "gui2-fw-lib": "file:../../../web/gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "gui2-fw-lib": "file:../../../web/gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
"rxjs": "^6.3.3",
"zone.js": "^0.8.26"
},
diff --git a/web/gui2-topo-lib/package-lock.json b/web/gui2-topo-lib/package-lock.json
index dd709c7..376351b 100644
--- a/web/gui2-topo-lib/package-lock.json
+++ b/web/gui2-topo-lib/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "gui2-topo-lib",
- "version": "2.1.0",
+ "version": "2.1.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -258,7 +258,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.2",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -1966,7 +1966,7 @@
"anymatch": "2.0.0",
"async-each": "1.0.2",
"braces": "2.3.2",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "3.1.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -4137,14 +4137,14 @@
"dev": true
},
"fsevents": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
- "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+ "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
"dev": true,
"optional": true,
"requires": {
"nan": "2.13.0",
- "node-pre-gyp": "0.10.3"
+ "node-pre-gyp": "0.12.0"
},
"dependencies": {
"abbrev": {
@@ -4216,12 +4216,12 @@
"optional": true
},
"debug": {
- "version": "2.6.9",
+ "version": "4.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "2.1.1"
}
},
"deep-extend": {
@@ -4386,37 +4386,37 @@
}
},
"ms": {
- "version": "2.0.0",
+ "version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
},
"needle": {
- "version": "2.2.4",
+ "version": "2.3.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
+ "debug": "4.1.1",
"iconv-lite": "0.4.24",
"sax": "1.2.4"
}
},
"node-pre-gyp": {
- "version": "0.10.3",
+ "version": "0.12.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
- "needle": "2.2.4",
+ "needle": "2.3.0",
"nopt": "4.0.1",
- "npm-packlist": "1.2.0",
+ "npm-packlist": "1.4.1",
"npmlog": "4.1.2",
"rc": "1.2.8",
"rimraf": "2.6.3",
- "semver": "5.6.0",
+ "semver": "5.7.0",
"tar": "4.4.8"
}
},
@@ -4431,19 +4431,19 @@
}
},
"npm-bundled": {
- "version": "1.0.5",
+ "version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true
},
"npm-packlist": {
- "version": "1.2.0",
+ "version": "1.4.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ignore-walk": "3.0.1",
- "npm-bundled": "1.0.5"
+ "npm-bundled": "1.0.6"
}
},
"npmlog": {
@@ -4573,7 +4573,7 @@
"optional": true
},
"semver": {
- "version": "5.6.0",
+ "version": "5.7.0",
"bundled": true,
"dev": true,
"optional": true
@@ -4872,8 +4872,8 @@
"dev": true
},
"gui2-fw-lib": {
- "version": "file:../gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.0.tgz",
- "integrity": "sha512-wcyiMBITpdVE+EmiN/uZWfHq3CK5kwmG+Os2xsmp3mJsslZSnK7f4taCUQkh0YXSxqpfGAi0xT+FCFIag/8SaQ==",
+ "version": "file:../gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "integrity": "sha512-667z5UF7smRugLD3muYVzs4jXPCZ8JBAde8YTwixoS1btVs6YzGPu4NXMUxdxJn/JbpRf6YXcnfRTgPmSQRX9w==",
"requires": {
"tslib": "1.9.3"
}
@@ -6232,6 +6232,12 @@
"minimatch": "3.0.4"
}
},
+ "karma-firefox-launcher": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz",
+ "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==",
+ "dev": true
+ },
"karma-jasmine": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
diff --git a/web/gui2-topo-lib/package.json b/web/gui2-topo-lib/package.json
index d855dd7..1483c73 100644
--- a/web/gui2-topo-lib/package.json
+++ b/web/gui2-topo-lib/package.json
@@ -22,7 +22,7 @@
"@angular/router": "~7.0.0",
"core-js": "^2.5.4",
"d3": "^5.9.2",
- "gui2-fw-lib": "file:../gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "gui2-fw-lib": "file:../gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
"rxjs": "~6.3.3",
"topojson-client": "^3.0.0",
"zone.js": "~0.8.26"
@@ -33,14 +33,15 @@
"@angular/cli": "~7.0.4",
"@angular/compiler-cli": "~7.0.0",
"@angular/language-service": "~7.0.0",
- "@types/node": "~8.9.4",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
+ "@types/node": "~8.9.4",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
+ "karma-firefox-launcher": "^1.1.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/karma.conf.js b/web/gui2-topo-lib/projects/gui2-topo-lib/karma.conf.js
index 4c5f8d0..8afd8a3 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/karma.conf.js
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/karma.conf.js
@@ -8,6 +8,7 @@
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
+ require('karma-firefox-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
@@ -25,7 +26,7 @@
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
- browsers: ['Chrome'],
+ browsers: ['Chrome', 'Firefox'],
singleRun: false
});
};
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts
index 77e5d55..cefeaea 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { async, ComponentFixture, TestBed, getTestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { BackgroundSvgComponent } from './backgroundsvg.component';
-import {MapSvgComponent} from '../mapsvg/mapsvg.component';
+import {MapSvgComponent, TopoData} from '../mapsvg/mapsvg.component';
import {from} from 'rxjs';
import {HttpClient} from '@angular/common/http';
import {LocMeta, LogService, ZoomUtils} from 'gui2-fw-lib';
@@ -29,28 +29,29 @@
import {LinkSvgComponent} from '../forcesvg/visuals/linksvg/linksvg.component';
import {HostNodeSvgComponent} from '../forcesvg/visuals/hostnodesvg/hostnodesvg.component';
-class MockHttpClient {
- get() {
- return from(['{"id":"app","icon":"nav_apps","cat":"PLATFORM","label":"Applications"}']);
- }
-
- subscribe() {}
-}
describe('BackgroundSvgComponent', () => {
+ let httpMock: HttpTestingController;
+
let logServiceSpy: jasmine.SpyObj<LogService>;
let component: BackgroundSvgComponent;
let fixture: ComponentFixture<BackgroundSvgComponent>;
+
const testmap: MapObject = <MapObject>{
scale: 1.0,
- id: 'test',
- description: 'test map'
+ id: 'bayareaGEO',
+ description: 'test map',
+ filePath: 'testmap'
};
- beforeEach(async(() => {
+ const sampleTopoData = <TopoData>require('../mapsvg/tests/bayarea.json');
+
+ beforeEach(() => {
const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
+
TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule],
declarations: [
BackgroundSvgComponent,
MapSvgComponent,
@@ -63,23 +64,25 @@
],
providers: [
{ provide: LogService, useValue: logSpy },
- { provide: HttpClient, useClass: MockHttpClient },
]
})
.compileComponents();
logServiceSpy = TestBed.get(LogService);
- }));
-
- beforeEach(() => {
+ httpMock = TestBed.get(HttpTestingController);
fixture = TestBed.createComponent(BackgroundSvgComponent);
+
component = fixture.componentInstance;
component.map = testmap;
fixture.detectChanges();
});
it('should create', () => {
+ httpMock.expectOne('testmap.topojson').flush(sampleTopoData);
+
expect(component).toBeTruthy();
+
+ httpMock.verify();
});
it('should convert latlong to xy', () => {
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
index aa9ce64..fb8f42c 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
@@ -16,7 +16,13 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ForceSvgComponent} from './forcesvg.component';
-import {FnService, LogService} from 'gui2-fw-lib';
+import {
+ FnService, IconService,
+ LionService,
+ LogService, SvgUtilService,
+ UrlFnService,
+ WebSocketService
+} from 'gui2-fw-lib';
import {DraggableDirective} from './draggable/draggable.directive';
import {ActivatedRoute, Params} from '@angular/router';
import {of} from 'rxjs';
@@ -26,7 +32,8 @@
import {HostNodeSvgComponent} from './visuals/hostnodesvg/hostnodesvg.component';
import {LinkSvgComponent} from './visuals/linksvg/linksvg.component';
import {Device, Host, Link, LinkType, Region} from './models';
-import {SimpleChange} from '@angular/core';
+import {ChangeDetectorRef, SimpleChange} from '@angular/core';
+import {TopologyService} from '../../topology.service';
class MockActivatedRoute extends ActivatedRoute {
constructor(params: Params) {
@@ -35,6 +42,53 @@
}
}
+class MockIconService {
+ loadIconDef() { }
+}
+
+class MockSvgUtilService {
+
+ cat7() {
+ const tcid = 'd3utilTestCard';
+
+ function getColor(id, muted, theme) {
+ // NOTE: since we are lazily assigning domain ids, we need to
+ // get the color from all 4 scales, to keep the domains
+ // in sync.
+ const ln = '#5b99d2';
+ const lm = '#9ebedf';
+ const dn = '#5b99d2';
+ const dm = '#9ebedf';
+ if (theme === 'dark') {
+ return muted ? dm : dn;
+ } else {
+ return muted ? lm : ln;
+ }
+ }
+
+ return {
+ // testCard: testCard,
+ getColor: getColor,
+ };
+ }
+}
+
+class MockUrlFnService { }
+
+class MockWebSocketService {
+ createWebSocket() { }
+ isConnected() { return false; }
+ unbindHandlers() { }
+ bindHandlers() { }
+}
+
+class MockTopologyService {
+ public instancesIndex: Map<string, number>;
+ constructor() {
+ this.instancesIndex = new Map();
+ }
+}
+
describe('ForceSvgComponent', () => {
let fs: FnService;
let ar: MockActivatedRoute;
@@ -46,7 +100,7 @@
const regionData: Region = <Region><unknown>(sampledata.payload);
const emptyRegion: Region = <Region>{devices: [ [], [], [] ], hosts: [ [], [], [] ], links: []};
- beforeEach(async(() => {
+ beforeEach(() => {
const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
ar = new MockActivatedRoute({ 'debug': 'txrx' });
@@ -62,6 +116,15 @@
}
};
+ const bundleObj = {
+ 'core.view.Topo': {
+ test: 'test1'
+ }
+ };
+ const mockLion = (key) => {
+ return bundleObj[key] || '%' + key + '%';
+ };
+
fs = new FnService(ar, logSpy, windowMock);
TestBed.configureTestingModule({
@@ -71,20 +134,32 @@
HostNodeSvgComponent,
SubRegionNodeSvgComponent,
LinkSvgComponent,
- DraggableDirective,
- MapSvgComponent
+ DraggableDirective
],
providers: [
- { provide: FnService, useValue: fs },
{ provide: LogService, useValue: logSpy },
+ { provide: ActivatedRoute, useValue: ar },
+ { provide: FnService, useValue: fs },
+ { provide: ChangeDetectorRef, useClass: ChangeDetectorRef },
+ { provide: UrlFnService, useClass: MockUrlFnService },
+ { provide: WebSocketService, useClass: MockWebSocketService },
+ { provide: LionService, useFactory: (() => {
+ return {
+ bundle: ((bundleId) => mockLion),
+ ubercache: new Array(),
+ loadCbs: new Map<string, () => void>([])
+ };
+ })
+ },
+ { provide: IconService, useClass: MockIconService },
+ { provide: SvgUtilService, useClass: MockSvgUtilService },
+ { provide: TopologyService, useClass: MockTopologyService },
{ provide: 'Window', useValue: windowMock },
]
})
.compileComponents();
logServiceSpy = TestBed.get(LogService);
- }));
- beforeEach(() => {
fixture = TestBed.createComponent(ForceSvgComponent);
component = fixture.debugElement.componentInstance;
fixture.detectChanges();
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/mapsvg.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/mapsvg.component.ts
index ec9bdae..268ab96 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/mapsvg.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/mapsvg.component.ts
@@ -56,7 +56,7 @@
/**
* Model of the topojson file
*/
-interface TopoData {
+export interface TopoData {
type: string; // Usually "Topology"
objects: Object; // Can be a list of countries or individual countries
arcs: number[][][]; // Coordinates
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/tests/bayarea.json b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/tests/bayarea.json
new file mode 100644
index 0000000..f42f01e
--- /dev/null
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/mapsvg/tests/bayarea.json
@@ -0,0 +1,7951 @@
+{
+ "type": "Topology",
+ "objects": {
+ "bayareaGEO": {
+ "type": "GeometryCollection",
+ "geometries": [
+ {
+ "type": "Polygon",
+ "properties": {
+ "id": "1",
+ "id_2": null
+ },
+ "arcs": [
+ [
+ 0
+ ]
+ ]
+ },
+ {
+ "type": "Polygon",
+ "properties": {
+ "id": "1",
+ "id_2": null
+ },
+ "arcs": [
+ [
+ 1
+ ],
+ [
+ 2
+ ],
+ [
+ 3
+ ],
+ [
+ 4
+ ]
+ ]
+ },
+ {
+ "type": "Polygon",
+ "properties": {
+ "id": null,
+ "id_2": null
+ },
+ "arcs": [
+ [
+ 5
+ ]
+ ]
+ },
+ {
+ "type": "Polygon",
+ "properties": {
+ "id": null,
+ "id_2": null
+ },
+ "arcs": [
+ [
+ 6
+ ]
+ ]
+ },
+ {
+ "type": "Polygon",
+ "properties": {
+ "id": null,
+ "id_2": null
+ },
+ "arcs": [
+ [
+ 7
+ ]
+ ]
+ }
+ ]
+ }
+ },
+ "arcs": [
+ [
+ [
+ -121.88778346897,
+ 37.470932004314
+ ],
+ [
+ -121.88441331969,
+ 37.639946684024
+ ],
+ [
+ -121.69574230232,
+ 37.610112237286
+ ],
+ [
+ -121.5591846074,
+ 37.482407003812
+ ],
+ [
+ -121.65620306458,
+ 37.372876810855
+ ],
+ [
+ -121.88025019411,
+ 37.414543587788
+ ],
+ [
+ -121.88778346897,
+ 37.470932004314
+ ]
+ ],
+ [
+ [
+ -122.41917671268,
+ 37.241614091443
+ ],
+ [
+ -122.41848285842,
+ 37.24869087536
+ ],
+ [
+ -122.41382412265,
+ 37.25825206214
+ ],
+ [
+ -122.41481534302,
+ 37.259757760846
+ ],
+ [
+ -122.41362587857,
+ 37.260134185523
+ ],
+ [
+ -122.41293202431,
+ 37.266985114633
+ ],
+ [
+ -122.41134607171,
+ 37.266533405022
+ ],
+ [
+ -122.40648909186,
+ 37.291377433665
+ ],
+ [
+ -122.40708382409,
+ 37.296572094199
+ ],
+ [
+ -122.40490313926,
+ 37.311553796321
+ ],
+ [
+ -122.40401104092,
+ 37.32480394493
+ ],
+ [
+ -122.40093825776,
+ 37.339635077181
+ ],
+ [
+ -122.40232596628,
+ 37.348217559803
+ ],
+ [
+ -122.40093825776,
+ 37.349196263962
+ ],
+ [
+ -122.39984791534,
+ 37.356800042426
+ ],
+ [
+ -122.40143386795,
+ 37.360639574125
+ ],
+ [
+ -122.40827328854,
+ 37.364102681148
+ ],
+ [
+ -122.40886802077,
+ 37.375621276246
+ ],
+ [
+ -122.41104870559,
+ 37.377202259887
+ ],
+ [
+ -122.41085046152,
+ 37.378933813399
+ ],
+ [
+ -122.41471622099,
+ 37.379987802493
+ ],
+ [
+ -122.41630217359,
+ 37.383902619128
+ ],
+ [
+ -122.41541007525,
+ 37.385483602768
+ ],
+ [
+ -122.41848285842,
+ 37.386914016539
+ ],
+ [
+ -122.42274510603,
+ 37.392259246944
+ ],
+ [
+ -122.42284422807,
+ 37.399637170602
+ ],
+ [
+ -122.42770120792,
+ 37.406262244907
+ ],
+ [
+ -122.42750296384,
+ 37.409800636865
+ ],
+ [
+ -122.43176521146,
+ 37.41130633557
+ ],
+ [
+ -122.43632482519,
+ 37.423653064957
+ ],
+ [
+ -122.43999234058,
+ 37.427567881592
+ ],
+ [
+ -122.44098356096,
+ 37.431859122903
+ ],
+ [
+ -122.44306512375,
+ 37.432988396932
+ ],
+ [
+ -122.44455195431,
+ 37.437656062919
+ ],
+ [
+ -122.44564229673,
+ 37.461446102469
+ ],
+ [
+ -122.44960717823,
+ 37.476728944331
+ ],
+ [
+ -122.45783430735,
+ 37.490506087488
+ ],
+ [
+ -122.47012544002,
+ 37.500594268816
+ ],
+ [
+ -122.47299997911,
+ 37.500820123622
+ ],
+ [
+ -122.48757091864,
+ 37.494496189058
+ ],
+ [
+ -122.49341911886,
+ 37.492915205417
+ ],
+ [
+ -122.49520331554,
+ 37.495776032958
+ ],
+ [
+ -122.49946556316,
+ 37.495550178152
+ ],
+ [
+ -122.50075414965,
+ 37.497733441275
+ ],
+ [
+ -122.49867258686,
+ 37.500518983881
+ ],
+ [
+ -122.50045678353,
+ 37.503379811421
+ ],
+ [
+ -122.51175669582,
+ 37.513166853008
+ ],
+ [
+ -122.51413562473,
+ 37.519566072507
+ ],
+ [
+ -122.51720840789,
+ 37.522125760307
+ ],
+ [
+ -122.51810050623,
+ 37.528148555129
+ ],
+ [
+ -122.51701016382,
+ 37.529428399029
+ ],
+ [
+ -122.51988470291,
+ 37.536204043205
+ ],
+ [
+ -122.51899260457,
+ 37.537333317234
+ ],
+ [
+ -122.51522596714,
+ 37.546066369727
+ ],
+ [
+ -122.5135408925,
+ 37.555326416767
+ ],
+ [
+ -122.51582069936,
+ 37.558563668984
+ ],
+ [
+ -122.51413562473,
+ 37.560295222495
+ ],
+ [
+ -122.51532508918,
+ 37.562478485618
+ ],
+ [
+ -122.51453211288,
+ 37.566318017318
+ ],
+ [
+ -122.51800138419,
+ 37.567673146153
+ ],
+ [
+ -122.51621718752,
+ 37.569254129794
+ ],
+ [
+ -122.51829875031,
+ 37.571136253176
+ ],
+ [
+ -122.51740665197,
+ 37.573018376558
+ ],
+ [
+ -122.52047943513,
+ 37.574147650587
+ ],
+ [
+ -122.51800138419,
+ 37.576707338387
+ ],
+ [
+ -122.51730752993,
+ 37.586795519715
+ ],
+ [
+ -122.51740665197,
+ 37.591312615832
+ ],
+ [
+ -122.52087592328,
+ 37.594399298178
+ ],
+ [
+ -122.51492860103,
+ 37.595754427013
+ ],
+ [
+ -122.51463123491,
+ 37.598690539489
+ ],
+ [
+ -122.50689971598,
+ 37.59613085169
+ ],
+ [
+ -122.50105151576,
+ 37.600422093001
+ ],
+ [
+ -122.49986205131,
+ 37.603584060283
+ ],
+ [
+ -122.50204273613,
+ 37.606670742629
+ ],
+ [
+ -122.49857346482,
+ 37.6081011564
+ ],
+ [
+ -122.49728487833,
+ 37.610510274329
+ ],
+ [
+ -122.49718575629,
+ 37.618339907598
+ ],
+ [
+ -122.49896995297,
+ 37.62022203098
+ ],
+ [
+ -122.49609541388,
+ 37.622857003715
+ ],
+ [
+ -122.49490594943,
+ 37.631590056208
+ ],
+ [
+ -122.4951041935,
+ 37.664339003056
+ ],
+ [
+ -122.49639277999,
+ 37.666371696309
+ ],
+ [
+ -122.49649190203,
+ 37.683084951942
+ ],
+ [
+ -122.50075414965,
+ 37.700852196668
+ ],
+ [
+ -122.50283571244,
+ 37.708154835391
+ ],
+ [
+ -122.49827609871,
+ 37.708154835391
+ ],
+ [
+ -122.49847434278,
+ 37.714855194631
+ ],
+ [
+ -122.50055590557,
+ 37.720576849712
+ ],
+ [
+ -122.50650322783,
+ 37.72795477337
+ ],
+ [
+ -122.50680059394,
+ 37.735407981963
+ ],
+ [
+ -122.50818830247,
+ 37.750991963567
+ ],
+ [
+ -122.51046810933,
+ 37.764091542306
+ ],
+ [
+ -122.5111619636,
+ 37.771318896093
+ ],
+ [
+ -122.51314440435,
+ 37.770791901546
+ ],
+ [
+ -122.51334264842,
+ 37.777341690916
+ ],
+ [
+ -122.51492860103,
+ 37.779750808845
+ ],
+ [
+ -122.51264879416,
+ 37.784117335091
+ ],
+ [
+ -122.50987337711,
+ 37.784794899509
+ ],
+ [
+ -122.50600761764,
+ 37.788182721596
+ ],
+ [
+ -122.49341911886,
+ 37.787655727049
+ ],
+ [
+ -122.48598496604,
+ 37.790817694331
+ ],
+ [
+ -122.47755959284,
+ 37.810994056987
+ ],
+ [
+ -122.47478417579,
+ 37.80918721854
+ ],
+ [
+ -122.46992719594,
+ 37.809413073346
+ ],
+ [
+ -122.46883685353,
+ 37.807003955417
+ ],
+ [
+ -122.46358338554,
+ 37.804895977229
+ ],
+ [
+ -122.44812034767,
+ 37.806928670482
+ ],
+ [
+ -122.44871507989,
+ 37.808660223993
+ ],
+ [
+ -122.43959585243,
+ 37.808886078799
+ ],
+ [
+ -122.44088443892,
+ 37.806928670482
+ ],
+ [
+ -122.43444150647,
+ 37.807003955417
+ ],
+ [
+ -122.42988189274,
+ 37.807832089705
+ ],
+ [
+ -122.42680910958,
+ 37.808133229446
+ ],
+ [
+ -122.42670998754,
+ 37.809638928152
+ ],
+ [
+ -122.42482666882,
+ 37.810768202181
+ ],
+ [
+ -122.42522315698,
+ 37.812650325563
+ ],
+ [
+ -122.4210600314,
+ 37.812876180369
+ ],
+ [
+ -122.40748031224,
+ 37.812725610499
+ ],
+ [
+ -122.39846020682,
+ 37.807229810223
+ ],
+ [
+ -122.3889444912,
+ 37.796614634348
+ ],
+ [
+ -122.38686292841,
+ 37.790064844978
+ ],
+ [
+ -122.38170858246,
+ 37.783515055609
+ ],
+ [
+ -122.37794194503,
+ 37.753626936302
+ ],
+ [
+ -122.37605862631,
+ 37.752572947208
+ ],
+ [
+ -122.37278759907,
+ 37.745496163291
+ ],
+ [
+ -122.36763325312,
+ 37.740150932886
+ ],
+ [
+ -122.37397706352,
+ 37.739473368468
+ ],
+ [
+ -122.36743500904,
+ 37.738193524569
+ ],
+ [
+ -122.37288672111,
+ 37.737064250539
+ ],
+ [
+ -122.37635599243,
+ 37.738344094439
+ ],
+ [
+ -122.37486916186,
+ 37.737290105345
+ ],
+ [
+ -122.37566213816,
+ 37.732773009228
+ ],
+ [
+ -122.37189550073,
+ 37.734203422999
+ ],
+ [
+ -122.36971481591,
+ 37.732396584552
+ ],
+ [
+ -122.36713764293,
+ 37.735633836769
+ ],
+ [
+ -122.36941744979,
+ 37.732170729746
+ ],
+ [
+ -122.36525432421,
+ 37.733826998322
+ ],
+ [
+ -122.36614642255,
+ 37.73194487494
+ ],
+ [
+ -122.36505608014,
+ 37.732848294163
+ ],
+ [
+ -122.36584905644,
+ 37.731719020134
+ ],
+ [
+ -122.36287539531,
+ 37.732170729746
+ ],
+ [
+ -122.36188417493,
+ 37.730062751558
+ ],
+ [
+ -122.35881139177,
+ 37.729761611817
+ ],
+ [
+ -122.36228066308,
+ 37.728557052852
+ ],
+ [
+ -122.35692807305,
+ 37.728707622723
+ ],
+ [
+ -122.36039734437,
+ 37.708305405261
+ ],
+ [
+ -122.39360322697,
+ 37.708230120326
+ ],
+ [
+ -122.39241376252,
+ 37.705821002397
+ ],
+ [
+ -122.39300849475,
+ 37.701529761086
+ ],
+ [
+ -122.38785414879,
+ 37.67864314076
+ ],
+ [
+ -122.38111385023,
+ 37.67736329686
+ ],
+ [
+ -122.38101472819,
+ 37.671867496584
+ ],
+ [
+ -122.38725941656,
+ 37.671792211649
+ ],
+ [
+ -122.38795327083,
+ 37.668856099173
+ ],
+ [
+ -122.39241376252,
+ 37.669910088267
+ ],
+ [
+ -122.39489181346,
+ 37.664489572927
+ ],
+ [
+ -122.39043132177,
+ 37.665995271632
+ ],
+ [
+ -122.38716029453,
+ 37.664564857862
+ ],
+ [
+ -122.38567346396,
+ 37.665167137344
+ ],
+ [
+ -122.38597083008,
+ 37.667651540209
+ ],
+ [
+ -122.38379014525,
+ 37.668329104626
+ ],
+ [
+ -122.38101472819,
+ 37.668027964885
+ ],
+ [
+ -122.38121297227,
+ 37.664564857862
+ ],
+ [
+ -122.37427442964,
+ 37.664037863315
+ ],
+ [
+ -122.37477003982,
+ 37.661177035774
+ ],
+ [
+ -122.37992438578,
+ 37.660574756292
+ ],
+ [
+ -122.37546389409,
+ 37.655003671081
+ ],
+ [
+ -122.37784282299,
+ 37.654476676534
+ ],
+ [
+ -122.37754545688,
+ 37.652218128476
+ ],
+ [
+ -122.38022175189,
+ 37.64815274197
+ ],
+ [
+ -122.39132342011,
+ 37.64815274197
+ ],
+ [
+ -122.3934049829,
+ 37.641904092342
+ ],
+ [
+ -122.39043132177,
+ 37.645216629494
+ ],
+ [
+ -122.38973746751,
+ 37.640398393636
+ ],
+ [
+ -122.38408751136,
+ 37.64017253883
+ ],
+ [
+ -122.38240243672,
+ 37.63618243726
+ ],
+ [
+ -122.37903228744,
+ 37.635429587907
+ ],
+ [
+ -122.38755678268,
+ 37.634827308425
+ ],
+ [
+ -122.3889444912,
+ 37.633246324784
+ ],
+ [
+ -122.38825063694,
+ 37.630234927373
+ ],
+ [
+ -122.38527697581,
+ 37.628804513603
+ ],
+ [
+ -122.3789331654,
+ 37.631514771273
+ ],
+ [
+ -122.37387794149,
+ 37.628126949185
+ ],
+ [
+ -122.36535344625,
+ 37.62820223412
+ ],
+ [
+ -122.36485783606,
+ 37.626847105285
+ ],
+ [
+ -122.36882271757,
+ 37.620749025527
+ ],
+ [
+ -122.35504475434,
+ 37.614952085511
+ ],
+ [
+ -122.35881139177,
+ 37.609456285235
+ ],
+ [
+ -122.37219286685,
+ 37.615027370446
+ ],
+ [
+ -122.37804106707,
+ 37.6068213125
+ ],
+ [
+ -122.37437355167,
+ 37.604562764442
+ ],
+ [
+ -122.37486916186,
+ 37.60411105483
+ ],
+ [
+ -122.36852535145,
+ 37.601852506771
+ ],
+ [
+ -122.3657499344,
+ 37.59741069559
+ ],
+ [
+ -122.36386661569,
+ 37.598389399748
+ ],
+ [
+ -122.36029822233,
+ 37.592065465185
+ ],
+ [
+ -122.33442737051,
+ 37.59214075012
+ ],
+ [
+ -122.33422912644,
+ 37.587849508809
+ ],
+ [
+ -122.33303966198,
+ 37.587849508809
+ ],
+ [
+ -122.33343615013,
+ 37.59628142156
+ ],
+ [
+ -122.33036336697,
+ 37.593119454279
+ ],
+ [
+ -122.32144238358,
+ 37.596206136625
+ ],
+ [
+ -122.31291788835,
+ 37.596356706496
+ ],
+ [
+ -122.30954773907,
+ 37.589957486997
+ ],
+ [
+ -122.31014247129,
+ 37.584536971656
+ ],
+ [
+ -122.30419514903,
+ 37.579869305669
+ ],
+ [
+ -122.2948776775,
+ 37.579267026186
+ ],
+ [
+ -122.29309348082,
+ 37.577234332934
+ ],
+ [
+ -122.28843474505,
+ 37.579417596057
+ ],
+ [
+ -122.28774089079,
+ 37.575427494487
+ ],
+ [
+ -122.28466810762,
+ 37.575803919163
+ ],
+ [
+ -122.27951376167,
+ 37.573846510846
+ ],
+ [
+ -122.2788199074,
+ 37.571362107982
+ ],
+ [
+ -122.27336819533,
+ 37.570232833953
+ ],
+ [
+ -122.26256389323,
+ 37.573846510846
+ ],
+ [
+ -122.25175959113,
+ 37.567597861218
+ ],
+ [
+ -122.24511841461,
+ 37.556907400407
+ ],
+ [
+ -122.24630787906,
+ 37.55351957832
+ ],
+ [
+ -122.25066924872,
+ 37.550282326103
+ ],
+ [
+ -122.24938066223,
+ 37.549228337009
+ ],
+ [
+ -122.2440280722,
+ 37.553594863255
+ ],
+ [
+ -122.24184738737,
+ 37.550357611038
+ ],
+ [
+ -122.22777205803,
+ 37.550056471297
+ ],
+ [
+ -122.22578961727,
+ 37.545388805309
+ ],
+ [
+ -122.22291507818,
+ 37.546216939597
+ ],
+ [
+ -122.23332289213,
+ 37.532138656699
+ ],
+ [
+ -122.24293772978,
+ 37.527621560582
+ ],
+ [
+ -122.24868680796,
+ 37.521071771213
+ ],
+ [
+ -122.24809207574,
+ 37.512263433785
+ ],
+ [
+ -122.24501929257,
+ 37.508122762344
+ ],
+ [
+ -122.24601051295,
+ 37.504734940256
+ ],
+ [
+ -122.24006319069,
+ 37.499916704398
+ ],
+ [
+ -122.23976582458,
+ 37.508800326762
+ ],
+ [
+ -122.23857636013,
+ 37.508725041826
+ ],
+ [
+ -122.22915976655,
+ 37.505563074545
+ ],
+ [
+ -122.22420366467,
+ 37.501121263363
+ ],
+ [
+ -122.22232034596,
+ 37.505036079998
+ ],
+ [
+ -122.21369672868,
+ 37.509703745985
+ ],
+ [
+ -122.2111195557,
+ 37.516554675096
+ ],
+ [
+ -122.20646081994,
+ 37.522728039789
+ ],
+ [
+ -122.19674686025,
+ 37.529503683965
+ ],
+ [
+ -122.19456617542,
+ 37.532966790988
+ ],
+ [
+ -122.19664773821,
+ 37.524233738495
+ ],
+ [
+ -122.20309067066,
+ 37.521899905501
+ ],
+ [
+ -122.17860752736,
+ 37.506240638962
+ ],
+ [
+ -122.17751718495,
+ 37.503229241551
+ ],
+ [
+ -122.17959874774,
+ 37.487795829818
+ ],
+ [
+ -122.17761630699,
+ 37.487720544883
+ ],
+ [
+ -122.17751718495,
+ 37.498185150887
+ ],
+ [
+ -122.17355230344,
+ 37.496077172699
+ ],
+ [
+ -122.16919093379,
+ 37.496077172699
+ ],
+ [
+ -122.16512693025,
+ 37.498862715304
+ ],
+ [
+ -122.15729628927,
+ 37.49893800024
+ ],
+ [
+ -122.15402526203,
+ 37.497432301534
+ ],
+ [
+ -122.15521472648,
+ 37.494270334252
+ ],
+ [
+ -122.15194369924,
+ 37.490506087488
+ ],
+ [
+ -122.15293491962,
+ 37.489979092941
+ ],
+ [
+ -122.14639286514,
+ 37.491484791647
+ ],
+ [
+ -122.14222973956,
+ 37.489226243588
+ ],
+ [
+ -122.14351832604,
+ 37.4871182654
+ ],
+ [
+ -122.1510516009,
+ 37.4871182654
+ ],
+ [
+ -122.15144808905,
+ 37.482601169283
+ ],
+ [
+ -122.15065511275,
+ 37.486892410594
+ ],
+ [
+ -122.14272534974,
+ 37.486666555789
+ ],
+ [
+ -122.14123851918,
+ 37.488021684624
+ ],
+ [
+ -122.14232886159,
+ 37.490506087488
+ ],
+ [
+ -122.14530252272,
+ 37.491936501258
+ ],
+ [
+ -122.15293491962,
+ 37.492538780741
+ ],
+ [
+ -122.15352965184,
+ 37.498712145434
+ ],
+ [
+ -122.16007170633,
+ 37.501196548298
+ ],
+ [
+ -122.15333140777,
+ 37.502551677133
+ ],
+ [
+ -122.15352965184,
+ 37.500142559204
+ ],
+ [
+ -122.15263755351,
+ 37.502777531939
+ ],
+ [
+ -122.14847442793,
+ 37.502401107263
+ ],
+ [
+ -122.14847442793,
+ 37.504584370386
+ ],
+ [
+ -122.13925607843,
+ 37.507972192474
+ ],
+ [
+ -122.1346964647,
+ 37.506842918444
+ ],
+ [
+ -122.13003772893,
+ 37.503455096357
+ ],
+ [
+ -122.12795616614,
+ 37.499239139981
+ ],
+ [
+ -122.12904650855,
+ 37.498109865952
+ ],
+ [
+ -122.12478426093,
+ 37.486741840724
+ ],
+ [
+ -122.13122719338,
+ 37.484182152924
+ ],
+ [
+ -122.13251577987,
+ 37.479966196548
+ ],
+ [
+ -122.12666757965,
+ 37.475072675755
+ ],
+ [
+ -122.12141411165,
+ 37.476879514202
+ ],
+ [
+ -122.12339655241,
+ 37.473190552373
+ ],
+ [
+ -122.11616064366,
+ 37.466189053392
+ ],
+ [
+ -122.11328610457,
+ 37.467544182227
+ ],
+ [
+ -122.11150190789,
+ 37.466264338327
+ ],
+ [
+ -122.09643535817,
+ 37.466113768456
+ ],
+ [
+ -122.09673272429,
+ 37.459940403763
+ ],
+ [
+ -122.09058715795,
+ 37.456853721417
+ ],
+ [
+ -122.0862257883,
+ 37.450303932047
+ ],
+ [
+ -122.08295476106,
+ 37.452110770494
+ ],
+ [
+ -122.08027846604,
+ 37.451960200623
+ ],
+ [
+ -122.07809778121,
+ 37.448195953859
+ ],
+ [
+ -122.07720568287,
+ 37.450078077241
+ ],
+ [
+ -122.07363728952,
+ 37.448798233341
+ ],
+ [
+ -122.06739260115,
+ 37.450454501918
+ ],
+ [
+ -122.06412157391,
+ 37.445636266059
+ ],
+ [
+ -122.05995844833,
+ 37.445636266059
+ ],
+ [
+ -122.05966108221,
+ 37.464081075204
+ ],
+ [
+ -122.05123570902,
+ 37.45903698454
+ ],
+ [
+ -122.04459453249,
+ 37.460693253116
+ ],
+ [
+ -122.0361691593,
+ 37.464984494427
+ ],
+ [
+ -121.99671858832,
+ 37.467243042486
+ ],
+ [
+ -121.99265458478,
+ 37.464608069751
+ ],
+ [
+ -121.97996696396,
+ 37.460919107922
+ ],
+ [
+ -121.97471349597,
+ 37.460768538051
+ ],
+ [
+ -121.9684688076,
+ 37.462801231304
+ ],
+ [
+ -121.96727934315,
+ 37.466941902744
+ ],
+ [
+ -121.97401964171,
+ 37.468598171321
+ ],
+ [
+ -121.97421788578,
+ 37.480794330837
+ ],
+ [
+ -121.99334843904,
+ 37.499464994787
+ ],
+ [
+ -121.99711507647,
+ 37.500443698945
+ ],
+ [
+ -122.00028698168,
+ 37.494872613734
+ ],
+ [
+ -122.01029830748,
+ 37.493366915029
+ ],
+ [
+ -122.00970357525,
+ 37.489000388782
+ ],
+ [
+ -122.01376757879,
+ 37.481622465125
+ ],
+ [
+ -122.02318417237,
+ 37.484709147471
+ ],
+ [
+ -122.02704993183,
+ 37.478611067713
+ ],
+ [
+ -122.03081656926,
+ 37.481547180189
+ ],
+ [
+ -122.0309156913,
+ 37.490129662812
+ ],
+ [
+ -122.035376183,
+ 37.494722043864
+ ],
+ [
+ -122.04340506804,
+ 37.495851317893
+ ],
+ [
+ -122.05242517347,
+ 37.50021784414
+ ],
+ [
+ -122.0577777635,
+ 37.501121263363
+ ],
+ [
+ -122.05549795663,
+ 37.50706877325
+ ],
+ [
+ -122.05827337369,
+ 37.515726540808
+ ],
+ [
+ -122.06322947557,
+ 37.515651255872
+ ],
+ [
+ -122.06719435707,
+ 37.513467992749
+ ],
+ [
+ -122.06907767579,
+ 37.51775923406
+ ],
+ [
+ -122.0725469471,
+ 37.516855814837
+ ],
+ [
+ -122.07294343526,
+ 37.518135658737
+ ],
+ [
+ -122.06124703482,
+ 37.522728039789
+ ],
+ [
+ -122.06907767579,
+ 37.524534878236
+ ],
+ [
+ -122.06749172319,
+ 37.530105963447
+ ],
+ [
+ -122.06283298742,
+ 37.528976689418
+ ],
+ [
+ -122.06729347911,
+ 37.540194144775
+ ],
+ [
+ -122.07353816748,
+ 37.535902903464
+ ],
+ [
+ -122.09375906316,
+ 37.529654253835
+ ],
+ [
+ -122.10188707024,
+ 37.522652754854
+ ],
+ [
+ -122.11031244344,
+ 37.511887009108
+ ],
+ [
+ -122.11725098607,
+ 37.506692348574
+ ],
+ [
+ -122.11853957256,
+ 37.526417001618
+ ],
+ [
+ -122.12042289128,
+ 37.532816221117
+ ],
+ [
+ -122.13578680711,
+ 37.558864808725
+ ],
+ [
+ -122.1410402751,
+ 37.562177345877
+ ],
+ [
+ -122.15352965184,
+ 37.582203138663
+ ],
+ [
+ -122.15501648241,
+ 37.591086761026
+ ],
+ [
+ -122.15243930943,
+ 37.599066964166
+ ],
+ [
+ -122.15580945871,
+ 37.611564263423
+ ],
+ [
+ -122.16245063523,
+ 37.614726230705
+ ],
+ [
+ -122.15759365539,
+ 37.621577159815
+ ],
+ [
+ -122.15838663169,
+ 37.63219233569
+ ],
+ [
+ -122.15975602629,
+ 37.637743456844
+ ],
+ [
+ -122.16691112692,
+ 37.666748120985
+ ],
+ [
+ -122.17216459492,
+ 37.673147340484
+ ],
+ [
+ -122.19724247044,
+ 37.692495568852
+ ],
+ [
+ -122.1979363247,
+ 37.698518363674
+ ],
+ [
+ -122.20546959956,
+ 37.70258375018
+ ],
+ [
+ -122.20913711495,
+ 37.696109245745
+ ],
+ [
+ -122.21617477962,
+ 37.695506966263
+ ],
+ [
+ -122.25651744894,
+ 37.72125441413
+ ],
+ [
+ -122.26910594772,
+ 37.737967669763
+ ],
+ [
+ -122.25949111007,
+ 37.752572947208
+ ],
+ [
+ -122.32154150562,
+ 37.771243611158
+ ],
+ [
+ -122.34027557073,
+ 37.800604735918
+ ],
+ [
+ -122.34671850318,
+ 37.810994056987
+ ],
+ [
+ -122.33393176032,
+ 37.81031649257
+ ],
+ [
+ -122.32302833618,
+ 37.810165922699
+ ],
+ [
+ -122.31767574615,
+ 37.815059443492
+ ],
+ [
+ -122.33284141791,
+ 37.814908873622
+ ],
+ [
+ -122.33284141791,
+ 37.818898975192
+ ],
+ [
+ -122.3288765364,
+ 37.819275399868
+ ],
+ [
+ -122.3288765364,
+ 37.820555243768
+ ],
+ [
+ -122.33066073308,
+ 37.820404673897
+ ],
+ [
+ -122.32996687882,
+ 37.821609232862
+ ],
+ [
+ -122.31767574615,
+ 37.824846485079
+ ],
+ [
+ -122.29358909101,
+ 37.828535446908
+ ],
+ [
+ -122.2948776775,
+ 37.833654822507
+ ],
+ [
+ -122.32025291913,
+ 37.838473058365
+ ],
+ [
+ -122.32005467505,
+ 37.843291294223
+ ],
+ [
+ -122.30954773907,
+ 37.845549842282
+ ],
+ [
+ -122.31083632556,
+ 37.854057039969
+ ],
+ [
+ -122.32233448192,
+ 37.853605330357
+ ],
+ [
+ -122.33125546531,
+ 37.857219007251
+ ],
+ [
+ -122.33264317383,
+ 37.862639522591
+ ],
+ [
+ -122.32927302455,
+ 37.871222005213
+ ],
+ [
+ -122.32590287527,
+ 37.874383972495
+ ],
+ [
+ -122.32758794991,
+ 37.877320084971
+ ],
+ [
+ -122.30835827462,
+ 37.8822888907
+ ],
+ [
+ -122.30835827462,
+ 37.890043239034
+ ],
+ [
+ -122.31182754593,
+ 37.897496447627
+ ],
+ [
+ -122.335715957,
+ 37.892301787093
+ ],
+ [
+ -122.33472473662,
+ 37.900583129974
+ ],
+ [
+ -122.33799576387,
+ 37.90351924245
+ ],
+ [
+ -122.34116766907,
+ 37.903368672579
+ ],
+ [
+ -122.34443869631,
+ 37.90223939855
+ ],
+ [
+ -122.34661938114,
+ 37.899228001139
+ ],
+ [
+ -122.34374484205,
+ 37.891398367869
+ ],
+ [
+ -122.35930700195,
+ 37.891172513063
+ ],
+ [
+ -122.36456046995,
+ 37.895313184504
+ ],
+ [
+ -122.37605862631,
+ 37.895012044763
+ ],
+ [
+ -122.38101472819,
+ 37.898776291527
+ ],
+ [
+ -122.38220419265,
+ 37.903368672579
+ ],
+ [
+ -122.39092693196,
+ 37.904497946608
+ ],
+ [
+ -122.3965768881,
+ 37.90765991389
+ ],
+ [
+ -122.39330586086,
+ 37.918124519895
+ ],
+ [
+ -122.39905493904,
+ 37.922942755753
+ ],
+ [
+ -122.41094958356,
+ 37.92745985187
+ ],
+ [
+ -122.41778900415,
+ 37.932503942534
+ ],
+ [
+ -122.41987056694,
+ 37.935967049557
+ ],
+ [
+ -122.41977144491,
+ 37.940333575803
+ ],
+ [
+ -122.42780032995,
+ 37.944624817114
+ ],
+ [
+ -122.42839506218,
+ 37.947862069331
+ ],
+ [
+ -122.42651174346,
+ 37.951701601031
+ ],
+ [
+ -122.4342432624,
+ 37.959305379494
+ ],
+ [
+ -122.435829215,
+ 37.964349470158
+ ],
+ [
+ -122.4342432624,
+ 37.967812577181
+ ],
+ [
+ -122.40321806462,
+ 37.967737292246
+ ],
+ [
+ -122.39984791534,
+ 37.972555528104
+ ],
+ [
+ -122.3926120066,
+ 37.974437651486
+ ],
+ [
+ -122.38488048766,
+ 37.980309876438
+ ],
+ [
+ -122.3773472128,
+ 37.980460446309
+ ],
+ [
+ -122.36822798534,
+ 37.991301476989
+ ],
+ [
+ -122.37100340239,
+ 37.995969142977
+ ],
+ [
+ -122.3733823313,
+ 38.008617012105
+ ],
+ [
+ -122.37080515832,
+ 38.014263382251
+ ],
+ [
+ -122.36783149719,
+ 38.016898354986
+ ],
+ [
+ -122.36366837161,
+ 38.017274779662
+ ],
+ [
+ -122.33769839775,
+ 38.007713592881
+ ],
+ [
+ -122.33185019753,
+ 38.008918151846
+ ],
+ [
+ -122.33125546531,
+ 38.006433748981
+ ],
+ [
+ -122.32639848546,
+ 38.009821571069
+ ],
+ [
+ -122.31926169875,
+ 38.015994935762
+ ],
+ [
+ -122.30469075922,
+ 38.01539265628
+ ],
+ [
+ -122.3025100744,
+ 38.017651204338
+ ],
+ [
+ -122.29656275214,
+ 38.019909752397
+ ],
+ [
+ -122.29477855546,
+ 38.024351563579
+ ],
+ [
+ -122.28873211117,
+ 38.026760681508
+ ],
+ [
+ -122.28674967041,
+ 38.030374358401
+ ],
+ [
+ -122.28119883631,
+ 38.031654202301
+ ],
+ [
+ -122.28090147019,
+ 38.039559120506
+ ],
+ [
+ -122.27604449035,
+ 38.04347393714
+ ],
+ [
+ -122.26950243587,
+ 38.044452641299
+ ],
+ [
+ -122.26861033753,
+ 38.047087614034
+ ],
+ [
+ -122.26989892402,
+ 38.058305069391
+ ],
+ [
+ -122.2696015579,
+ 38.060413047579
+ ],
+ [
+ -122.26533931029,
+ 38.059886053032
+ ],
+ [
+ -122.24521753665,
+ 38.063951439537
+ ],
+ [
+ -122.23203430564,
+ 38.061843461349
+ ],
+ [
+ -122.26099075155,
+ 38.095244490583
+ ],
+ [
+ -122.28139708038,
+ 38.119963431388
+ ],
+ [
+ -122.2748550259,
+ 38.121469130093
+ ],
+ [
+ -122.26335686953,
+ 38.13110560181
+ ],
+ [
+ -122.25592271671,
+ 38.132385445709
+ ],
+ [
+ -122.25532798449,
+ 38.12598622621
+ ],
+ [
+ -122.24987627242,
+ 38.128018919463
+ ],
+ [
+ -122.24848856389,
+ 38.122523119187
+ ],
+ [
+ -122.22935801063,
+ 38.124329957634
+ ],
+ [
+ -122.21726512204,
+ 38.143377046261
+ ],
+ [
+ -122.21468794906,
+ 38.154895641359
+ ],
+ [
+ -122.19535915172,
+ 38.15504621123
+ ],
+ [
+ -122.19902666711,
+ 38.159337452541
+ ],
+ [
+ -122.19446705338,
+ 38.164682682946
+ ],
+ [
+ -122.19803544674,
+ 38.16844692971
+ ],
+ [
+ -122.20190120621,
+ 38.168296359839
+ ],
+ [
+ -122.18068909015,
+ 38.185461325084
+ ],
+ [
+ -122.17652596457,
+ 38.184859045602
+ ],
+ [
+ -122.16195502504,
+ 38.191408834971
+ ],
+ [
+ -122.15719716724,
+ 38.187719873142
+ ],
+ [
+ -122.15590858075,
+ 38.180191379614
+ ],
+ [
+ -122.15362877388,
+ 38.178384541167
+ ],
+ [
+ -122.1518445772,
+ 38.172662886086
+ ],
+ [
+ -122.16611815062,
+ 38.14706600809
+ ],
+ [
+ -122.16988478805,
+ 38.137203681568
+ ],
+ [
+ -122.1655234184,
+ 38.126061511146
+ ],
+ [
+ -122.16651463877,
+ 38.119210582035
+ ],
+ [
+ -122.16463132006,
+ 38.114994625659
+ ],
+ [
+ -122.16542429636,
+ 38.110778669283
+ ],
+ [
+ -122.16364009968,
+ 38.108218981484
+ ],
+ [
+ -122.16284712338,
+ 38.101217482502
+ ],
+ [
+ -122.16086468263,
+ 38.10046463315
+ ],
+ [
+ -122.16344185561,
+ 38.106336858102
+ ],
+ [
+ -122.16324361153,
+ 38.120264571129
+ ],
+ [
+ -122.15779189946,
+ 38.12199612464
+ ],
+ [
+ -122.1547191163,
+ 38.120114001258
+ ],
+ [
+ -122.14897003811,
+ 38.120490425935
+ ],
+ [
+ -122.14827618385,
+ 38.124329957634
+ ],
+ [
+ -122.14738408551,
+ 38.121243275288
+ ],
+ [
+ -122.14014817677,
+ 38.117704883329
+ ],
+ [
+ -122.14153588529,
+ 38.121544415029
+ ],
+ [
+ -122.13806661398,
+ 38.124179387764
+ ],
+ [
+ -122.13241665783,
+ 38.126136796081
+ ],
+ [
+ -122.1278570441,
+ 38.125007522052
+ ],
+ [
+ -122.12161235573,
+ 38.129750472975
+ ],
+ [
+ -122.12428865075,
+ 38.137580106244
+ ],
+ [
+ -122.12240533203,
+ 38.14194663249
+ ],
+ [
+ -122.11507030125,
+ 38.146840153284
+ ],
+ [
+ -122.1102133214,
+ 38.145861449125
+ ],
+ [
+ -122.11130366382,
+ 38.14849642186
+ ],
+ [
+ -122.11259225031,
+ 38.148195282119
+ ],
+ [
+ -122.11526854532,
+ 38.156476625
+ ],
+ [
+ -122.12736143391,
+ 38.171383042186
+ ],
+ [
+ -122.11388083679,
+ 38.170931332574
+ ],
+ [
+ -122.11378171476,
+ 38.16844692971
+ ],
+ [
+ -122.10852824676,
+ 38.164080403464
+ ],
+ [
+ -122.11407908087,
+ 38.162122995146
+ ],
+ [
+ -122.11427732495,
+ 38.158208178512
+ ],
+ [
+ -122.11189839604,
+ 38.1551967811
+ ],
+ [
+ -122.10833000269,
+ 38.154970926294
+ ],
+ [
+ -122.10297741266,
+ 38.158961027864
+ ],
+ [
+ -122.10059848375,
+ 38.156551909935
+ ],
+ [
+ -122.0846398357,
+ 38.150980824724
+ ],
+ [
+ -122.09554325983,
+ 38.137881245985
+ ],
+ [
+ -122.08662227645,
+ 38.135170988315
+ ],
+ [
+ -122.08245915087,
+ 38.136300262344
+ ],
+ [
+ -122.0825582729,
+ 38.127416639981
+ ],
+ [
+ -122.08008022196,
+ 38.12455581244
+ ],
+ [
+ -122.07264606914,
+ 38.121318560223
+ ],
+ [
+ -122.06590577058,
+ 38.120791565676
+ ],
+ [
+ -122.06451806206,
+ 38.117403743588
+ ],
+ [
+ -122.06580664855,
+ 38.10731556226
+ ],
+ [
+ -122.06768996726,
+ 38.103927740173
+ ],
+ [
+ -122.10317565673,
+ 38.075319464765
+ ],
+ [
+ -122.11804396237,
+ 38.060940042126
+ ],
+ [
+ -122.11933254886,
+ 38.062897450443
+ ],
+ [
+ -122.12002640313,
+ 38.062144601091
+ ],
+ [
+ -122.12438777278,
+ 38.057853359779
+ ],
+ [
+ -122.1278570441,
+ 38.047388753775
+ ],
+ [
+ -122.13142543745,
+ 38.043398652205
+ ],
+ [
+ -122.13826485805,
+ 38.039784975312
+ ],
+ [
+ -122.13330875617,
+ 38.042871657658
+ ],
+ [
+ -122.15253843147,
+ 38.042796372723
+ ],
+ [
+ -122.15967521818,
+ 38.033385755813
+ ],
+ [
+ -122.16453219802,
+ 38.034740884648
+ ],
+ [
+ -122.17612947642,
+ 38.047765178452
+ ],
+ [
+ -122.18386099536,
+ 38.05401382808
+ ],
+ [
+ -122.1947644195,
+ 38.056498230944
+ ],
+ [
+ -122.22519488505,
+ 38.061015327061
+ ],
+ [
+ -122.22420366467,
+ 38.057702789909
+ ],
+ [
+ -122.20596520975,
+ 38.055368956915
+ ],
+ [
+ -122.20368540288,
+ 38.05401382808
+ ],
+ [
+ -122.19070041595,
+ 38.052432844439
+ ],
+ [
+ -122.18584343611,
+ 38.04987315664
+ ],
+ [
+ -122.17890489348,
+ 38.04460321117
+ ],
+ [
+ -122.1747417679,
+ 38.038806271153
+ ],
+ [
+ -122.17345318141,
+ 38.034740884648
+ ],
+ [
+ -122.17464264586,
+ 38.035945443612
+ ],
+ [
+ -122.17662508661,
+ 38.033988035295
+ ],
+ [
+ -122.17067776435,
+ 38.031051922819
+ ],
+ [
+ -122.16215326912,
+ 38.02608311709
+ ],
+ [
+ -122.16582078451,
+ 38.024200993708
+ ],
+ [
+ -122.17454352382,
+ 38.024200993708
+ ],
+ [
+ -122.17414703567,
+ 38.022620010067
+ ],
+ [
+ -122.1779136731,
+ 38.017425349533
+ ],
+ [
+ -122.17761630699,
+ 38.015091516539
+ ],
+ [
+ -122.16542429636,
+ 38.006509033917
+ ],
+ [
+ -122.15511560445,
+ 38.00470219547
+ ],
+ [
+ -122.14758232959,
+ 38.000260384288
+ ],
+ [
+ -122.14530252272,
+ 37.997023132071
+ ],
+ [
+ -122.13985081065,
+ 37.997926551294
+ ],
+ [
+ -122.14520340068,
+ 38.0007120939
+ ],
+ [
+ -122.14421218031,
+ 38.005906754434
+ ],
+ [
+ -122.14312183789,
+ 38.005831469499
+ ],
+ [
+ -122.14460866846,
+ 38.007487738075
+ ],
+ [
+ -122.15095247887,
+ 38.009746286134
+ ],
+ [
+ -122.15214194332,
+ 38.011477839645
+ ],
+ [
+ -122.15075423479,
+ 38.012757683545
+ ],
+ [
+ -122.15491736037,
+ 38.013359963027
+ ],
+ [
+ -122.14857354996,
+ 38.017575919403
+ ],
+ [
+ -122.14748320755,
+ 38.019006333174
+ ],
+ [
+ -122.14847442793,
+ 38.020888456556
+ ],
+ [
+ -122.15848575373,
+ 38.024878558126
+ ],
+ [
+ -122.14669023125,
+ 38.023598714226
+ ],
+ [
+ -122.14688847532,
+ 38.031729487236
+ ],
+ [
+ -122.12399128463,
+ 38.035719588806
+ ],
+ [
+ -122.09336257501,
+ 38.049120307287
+ ],
+ [
+ -122.07740392695,
+ 38.05401382808
+ ],
+ [
+ -122.06114791278,
+ 38.062144601091
+ ],
+ [
+ -122.05083922086,
+ 38.060187192773
+ ],
+ [
+ -122.02923061666,
+ 38.05928377355
+ ],
+ [
+ -122.02923061666,
+ 38.05657351588
+ ],
+ [
+ -122.03369110836,
+ 38.050550721057
+ ],
+ [
+ -122.03071744723,
+ 38.043775076882
+ ],
+ [
+ -122.04846029196,
+ 38.03150363243
+ ],
+ [
+ -122.03884545431,
+ 38.030148503595
+ ],
+ [
+ -122.03894457635,
+ 38.028191095278
+ ],
+ [
+ -122.0325016439,
+ 38.027513530861
+ ],
+ [
+ -122.03260076594,
+ 38.029772078919
+ ],
+ [
+ -122.03151042353,
+ 38.029621509048
+ ],
+ [
+ -122.03111393538,
+ 38.032557621524
+ ],
+ [
+ -122.02843764036,
+ 38.032858761266
+ ],
+ [
+ -122.02972622685,
+ 38.031277777625
+ ],
+ [
+ -122.02605871146,
+ 38.024351563579
+ ],
+ [
+ -122.01123526801,
+ 38.016975195765
+ ],
+ [
+ -122.00593693782,
+ 38.015769080956
+ ],
+ [
+ -122.00355800892,
+ 38.01667250018
+ ],
+ [
+ -121.99959312741,
+ 38.014940946668
+ ],
+ [
+ -121.99493439164,
+ 38.018554623562
+ ],
+ [
+ -121.99671858832,
+ 38.018855763303
+ ],
+ [
+ -122.00028698168,
+ 38.028040525407
+ ],
+ [
+ -121.99681771036,
+ 38.030223788531
+ ],
+ [
+ -121.99721419851,
+ 38.036848862836
+ ],
+ [
+ -121.99235721867,
+ 38.036848862836
+ ],
+ [
+ -121.99225809663,
+ 38.033310470877
+ ],
+ [
+ -121.98759936086,
+ 38.033385755813
+ ],
+ [
+ -121.98740111678,
+ 38.036171298418
+ ],
+ [
+ -121.98095818434,
+ 38.034213890101
+ ],
+ [
+ -121.97947135377,
+ 38.03391275036
+ ],
+ [
+ -121.99602473406,
+ 38.038806271153
+ ],
+ [
+ -121.99602473406,
+ 38.041290674017
+ ],
+ [
+ -121.99731332055,
+ 38.041290674017
+ ],
+ [
+ -121.99731332055,
+ 38.045205490652
+ ],
+ [
+ -121.98799584901,
+ 38.044076216623
+ ],
+ [
+ -121.98759936086,
+ 38.052131704698
+ ],
+ [
+ -121.98343623528,
+ 38.04987315664
+ ],
+ [
+ -121.98482394381,
+ 38.047614608581
+ ],
+ [
+ -121.9832379912,
+ 38.047765178452
+ ],
+ [
+ -121.98294062509,
+ 38.049647301834
+ ],
+ [
+ -121.97758803506,
+ 38.047840463387
+ ],
+ [
+ -121.97729066895,
+ 38.045732485199
+ ],
+ [
+ -121.97709242487,
+ 38.047915748322
+ ],
+ [
+ -121.95736713938,
+ 38.048442742869
+ ],
+ [
+ -121.95697065123,
+ 38.040161399988
+ ],
+ [
+ -121.95994431236,
+ 38.040387254794
+ ],
+ [
+ -121.96043992255,
+ 38.038505131412
+ ],
+ [
+ -121.93268575202,
+ 38.031127207754
+ ],
+ [
+ -121.93248750794,
+ 38.033536325683
+ ],
+ [
+ -121.92852262644,
+ 38.034439744907
+ ],
+ [
+ -121.9284235044,
+ 38.047087614034
+ ],
+ [
+ -121.91018504947,
+ 38.044979635846
+ ],
+ [
+ -121.88520629599,
+ 38.047614608581
+ ],
+ [
+ -121.87113096665,
+ 38.053035123921
+ ],
+ [
+ -121.86448979013,
+ 38.061015327061
+ ],
+ [
+ -121.86250734938,
+ 38.066059417725
+ ],
+ [
+ -121.86161525104,
+ 38.069898949425
+ ],
+ [
+ -121.87668180076,
+ 38.072985631771
+ ],
+ [
+ -121.88272824505,
+ 38.076072314118
+ ],
+ [
+ -121.88520629599,
+ 38.080137700623
+ ],
+ [
+ -121.88322385524,
+ 38.088795468181
+ ],
+ [
+ -121.88768434693,
+ 38.094140698586
+ ],
+ [
+ -121.89591147606,
+ 38.097453235738
+ ],
+ [
+ -121.88966678769,
+ 38.104755874461
+ ],
+ [
+ -121.89095537418,
+ 38.11243493786
+ ],
+ [
+ -121.88857644527,
+ 38.120942135546
+ ],
+ [
+ -121.88966678769,
+ 38.124932237116
+ ],
+ [
+ -121.89382991327,
+ 38.126663790628
+ ],
+ [
+ -121.89690269643,
+ 38.12598622621
+ ],
+ [
+ -121.90512982556,
+ 38.118834157359
+ ],
+ [
+ -121.90968943929,
+ 38.119210582035
+ ],
+ [
+ -121.91365432079,
+ 38.121694984899
+ ],
+ [
+ -121.91543851747,
+ 38.131557311421
+ ],
+ [
+ -121.90859909687,
+ 38.140139794044
+ ],
+ [
+ -121.90899558502,
+ 38.143904040808
+ ],
+ [
+ -121.91038329355,
+ 38.146689583413
+ ],
+ [
+ -121.92832438236,
+ 38.160542011505
+ ],
+ [
+ -121.93407346054,
+ 38.167919935163
+ ],
+ [
+ -121.91801569045,
+ 38.178459826103
+ ],
+ [
+ -121.91861042267,
+ 38.180191379614
+ ],
+ [
+ -121.92782877217,
+ 38.183805056508
+ ],
+ [
+ -121.92991033496,
+ 38.18696702379
+ ],
+ [
+ -121.92881999255,
+ 38.183805056508
+ ],
+ [
+ -121.92069198546,
+ 38.178685680908
+ ],
+ [
+ -121.92128671769,
+ 38.177405837009
+ ],
+ [
+ -121.92326915844,
+ 38.178610395973
+ ],
+ [
+ -121.9215840838,
+ 38.177179982203
+ ],
+ [
+ -121.92891911459,
+ 38.173641590244
+ ],
+ [
+ -121.93199189775,
+ 38.17371687518
+ ],
+ [
+ -121.93565941314,
+ 38.176351847915
+ ],
+ [
+ -121.93615502333,
+ 38.181471223514
+ ],
+ [
+ -121.93893044039,
+ 38.183654486637
+ ],
+ [
+ -121.9392278065,
+ 38.18711759366
+ ],
+ [
+ -121.94349005412,
+ 38.189903136266
+ ],
+ [
+ -121.94428303042,
+ 38.187494018337
+ ],
+ [
+ -121.94210234559,
+ 38.184106196249
+ ],
+ [
+ -121.94527425079,
+ 38.181245368708
+ ],
+ [
+ -121.94854527804,
+ 38.184633190796
+ ],
+ [
+ -121.95191542731,
+ 38.183805056508
+ ],
+ [
+ -121.95389786807,
+ 38.185084900407
+ ],
+ [
+ -121.95736713938,
+ 38.184332051055
+ ],
+ [
+ -121.95825923772,
+ 38.180492519355
+ ],
+ [
+ -121.96192675312,
+ 38.183353346896
+ ],
+ [
+ -121.96400831591,
+ 38.182449927673
+ ],
+ [
+ -121.96172850904,
+ 38.172286461409
+ ],
+ [
+ -121.96222411923,
+ 38.172662886086
+ ],
+ [
+ -121.9632153396,
+ 38.172662886086
+ ],
+ [
+ -121.96361182775,
+ 38.172587601151
+ ],
+ [
+ -121.96371094979,
+ 38.172512316215
+ ],
+ [
+ -121.96093553274,
+ 38.170404338027
+ ],
+ [
+ -121.95538469863,
+ 38.170479622963
+ ],
+ [
+ -121.95260928158,
+ 38.167091800875
+ ],
+ [
+ -121.9532040138,
+ 38.164080403464
+ ],
+ [
+ -121.95736713938,
+ 38.160316156699
+ ],
+ [
+ -121.96549514647,
+ 38.160843151246
+ ],
+ [
+ -121.96450392609,
+ 38.159864447088
+ ],
+ [
+ -121.96569339054,
+ 38.159262167605
+ ],
+ [
+ -121.9660898787,
+ 38.158584603188
+ ],
+ [
+ -121.95677240716,
+ 38.160165586829
+ ],
+ [
+ -121.9508250849,
+ 38.156326055129
+ ],
+ [
+ -121.95310489177,
+ 38.154820356424
+ ],
+ [
+ -121.95013123064,
+ 38.156250770194
+ ],
+ [
+ -121.94487776264,
+ 38.154443931747
+ ],
+ [
+ -121.95151893916,
+ 38.148421136925
+ ],
+ [
+ -121.94914001026,
+ 38.142172487296
+ ],
+ [
+ -121.95221279343,
+ 38.138483525467
+ ],
+ [
+ -121.94517512876,
+ 38.135999122603
+ ],
+ [
+ -121.93674975556,
+ 38.128922338686
+ ],
+ [
+ -121.93219014183,
+ 38.122824258929
+ ],
+ [
+ -121.9416067354,
+ 38.113263072148
+ ],
+ [
+ -121.94448127449,
+ 38.117253173718
+ ],
+ [
+ -121.95330313584,
+ 38.121469130093
+ ],
+ [
+ -121.97629944857,
+ 38.129675188039
+ ],
+ [
+ -121.98056169619,
+ 38.128997623622
+ ],
+ [
+ -121.98105730638,
+ 38.130653892198
+ ],
+ [
+ -121.99126687625,
+ 38.138935235079
+ ],
+ [
+ -121.98145379453,
+ 38.130277467522
+ ],
+ [
+ -121.98135467249,
+ 38.125760371405
+ ],
+ [
+ -121.97857925544,
+ 38.122824258929
+ ],
+ [
+ -121.97709242487,
+ 38.117629598394
+ ],
+ [
+ -121.98125555045,
+ 38.112660792665
+ ],
+ [
+ -121.98789672697,
+ 38.111456233701
+ ],
+ [
+ -121.98393184547,
+ 38.114241776306
+ ],
+ [
+ -121.98948267957,
+ 38.125760371405
+ ],
+ [
+ -121.99959312741,
+ 38.136977826762
+ ],
+ [
+ -122.00702728023,
+ 38.140742073526
+ ],
+ [
+ -122.02021051124,
+ 38.137354251438
+ ],
+ [
+ -122.04419804434,
+ 38.137053111697
+ ],
+ [
+ -122.05301990569,
+ 38.133138295062
+ ],
+ [
+ -122.05629093293,
+ 38.13381585948
+ ],
+ [
+ -122.05976020425,
+ 38.138709380273
+ ],
+ [
+ -122.05837249572,
+ 38.143979325743
+ ],
+ [
+ -122.03646652541,
+ 38.170103198286
+ ],
+ [
+ -122.03289813205,
+ 38.170404338027
+ ],
+ [
+ -122.0285367624,
+ 38.168221074904
+ ],
+ [
+ -122.02080524346,
+ 38.169124494128
+ ],
+ [
+ -122.00970357525,
+ 38.176125993109
+ ],
+ [
+ -121.99632210017,
+ 38.179589100132
+ ],
+ [
+ -121.99721419851,
+ 38.175824853368
+ ],
+ [
+ -122.00028698168,
+ 38.172587601151
+ ],
+ [
+ -122.00425186318,
+ 38.170630192833
+ ],
+ [
+ -122.00454922929,
+ 38.169952628416
+ ],
+ [
+ -122.0032606428,
+ 38.168371644775
+ ],
+ [
+ -122.0000887376,
+ 38.166338951522
+ ],
+ [
+ -121.99315019497,
+ 38.164381543205
+ ],
+ [
+ -121.99394317127,
+ 38.161671285535
+ ],
+ [
+ -121.99533087979,
+ 38.162122995146
+ ],
+ [
+ -121.99761068666,
+ 38.160993721117
+ ],
+ [
+ -121.99404229331,
+ 38.161144290988
+ ],
+ [
+ -121.99176248644,
+ 38.163628693852
+ ],
+ [
+ -121.99374492719,
+ 38.164908537752
+ ],
+ [
+ -122.00107995798,
+ 38.167091800875
+ ],
+ [
+ -122.00435098522,
+ 38.170404338027
+ ],
+ [
+ -122.00107995798,
+ 38.171759466862
+ ],
+ [
+ -121.99919663926,
+ 38.173340450503
+ ],
+ [
+ -121.99622297813,
+ 38.176803557526
+ ],
+ [
+ -121.99572736795,
+ 38.179739670002
+ ],
+ [
+ -121.98175116064,
+ 38.186364744307
+ ],
+ [
+ -121.9768941808,
+ 38.18696702379
+ ],
+ [
+ -121.97957047581,
+ 38.187795158078
+ ],
+ [
+ -121.98809497105,
+ 38.184934330537
+ ],
+ [
+ -121.98700462863,
+ 38.189150286913
+ ],
+ [
+ -121.9961238561,
+ 38.192613393936
+ ],
+ [
+ -121.98829321512,
+ 38.189225571848
+ ],
+ [
+ -121.98829321512,
+ 38.186590599113
+ ],
+ [
+ -121.9969168324,
+ 38.181922933126
+ ],
+ [
+ -122.01495704324,
+ 38.177255267138
+ ],
+ [
+ -122.02496836904,
+ 38.170630192833
+ ],
+ [
+ -122.03577267115,
+ 38.172286461409
+ ],
+ [
+ -122.03557442707,
+ 38.17898682065
+ ],
+ [
+ -122.03716037967,
+ 38.178384541167
+ ],
+ [
+ -122.03815160005,
+ 38.178459826103
+ ],
+ [
+ -122.04152174933,
+ 38.180191379614
+ ],
+ [
+ -122.03706125763,
+ 38.178535111038
+ ],
+ [
+ -122.03002359296,
+ 38.181772363255
+ ],
+ [
+ -122.02962710481,
+ 38.178610395973
+ ],
+ [
+ -122.02298592829,
+ 38.177179982203
+ ],
+ [
+ -122.01317284657,
+ 38.180643089226
+ ],
+ [
+ -122.01951665698,
+ 38.179212675455
+ ],
+ [
+ -122.01872368067,
+ 38.181019513902
+ ],
+ [
+ -122.02070612143,
+ 38.180793659096
+ ],
+ [
+ -122.02268856218,
+ 38.178384541167
+ ],
+ [
+ -122.02546397923,
+ 38.179664385067
+ ],
+ [
+ -122.02407627071,
+ 38.181998218061
+ ],
+ [
+ -122.02744641999,
+ 38.18184764819
+ ],
+ [
+ -122.02883412851,
+ 38.183805056508
+ ],
+ [
+ -122.02576134535,
+ 38.188773862236
+ ],
+ [
+ -122.03369110836,
+ 38.194796657059
+ ],
+ [
+ -122.03755686782,
+ 38.193290958353
+ ],
+ [
+ -122.0361691593,
+ 38.19110769523
+ ],
+ [
+ -122.03468232873,
+ 38.193592098094
+ ],
+ [
+ -122.03636740337,
+ 38.190279560942
+ ],
+ [
+ -122.0377551119,
+ 38.189225571848
+ ],
+ [
+ -122.04370243416,
+ 38.190053706136
+ ],
+ [
+ -122.05440761422,
+ 38.185913034696
+ ],
+ [
+ -122.05411024811,
+ 38.183202777025
+ ],
+ [
+ -122.0469734614,
+ 38.181772363255
+ ],
+ [
+ -122.04637872917,
+ 38.178459826103
+ ],
+ [
+ -122.05767864146,
+ 38.179513815197
+ ],
+ [
+ -122.05896722795,
+ 38.177255267138
+ ],
+ [
+ -122.05728215331,
+ 38.172211176474
+ ],
+ [
+ -122.06372508576,
+ 38.173039310762
+ ],
+ [
+ -122.06838382152,
+ 38.179287960391
+ ],
+ [
+ -122.07185309284,
+ 38.180266664549
+ ],
+ [
+ -122.07215045895,
+ 38.181471223514
+ ],
+ [
+ -122.06788821134,
+ 38.183503916767
+ ],
+ [
+ -122.0662031367,
+ 38.188246867689
+ ],
+ [
+ -122.06679786892,
+ 38.190580700683
+ ],
+ [
+ -122.06590577058,
+ 38.191484119907
+ ],
+ [
+ -122.0662031367,
+ 38.19238753913
+ ],
+ [
+ -122.0677890893,
+ 38.192312254195
+ ],
+ [
+ -122.06630225873,
+ 38.191182980165
+ ],
+ [
+ -122.06927591986,
+ 38.191032410295
+ ],
+ [
+ -122.04231472563,
+ 38.241849741611
+ ],
+ [
+ -122.03815160005,
+ 38.246592692534
+ ],
+ [
+ -122.01485792121,
+ 38.259767556208
+ ],
+ [
+ -122.01485792121,
+ 38.25765957802
+ ],
+ [
+ -122.01237987027,
+ 38.25765957802
+ ],
+ [
+ -122.01198338212,
+ 38.261273254914
+ ],
+ [
+ -122.00524308356,
+ 38.265037501678
+ ],
+ [
+ -122.00722552431,
+ 38.263682372843
+ ],
+ [
+ -122.00663079208,
+ 38.253293051774
+ ],
+ [
+ -121.98819409309,
+ 38.252991912033
+ ],
+ [
+ -121.98809497105,
+ 38.264435222196
+ ],
+ [
+ -121.98492306584,
+ 38.264736361937
+ ],
+ [
+ -121.97966959785,
+ 38.264585792066
+ ],
+ [
+ -121.98155291656,
+ 38.26149910972
+ ],
+ [
+ -121.98135467249,
+ 38.252991912033
+ ],
+ [
+ -121.96936090594,
+ 38.252841342162
+ ],
+ [
+ -121.9692617839,
+ 38.254422325803
+ ],
+ [
+ -121.97401964171,
+ 38.254422325803
+ ],
+ [
+ -121.97491174004,
+ 38.267296049736
+ ],
+ [
+ -121.93347872832,
+ 38.266392630513
+ ],
+ [
+ -121.92247618214,
+ 38.275953817294
+ ],
+ [
+ -121.92654018568,
+ 38.279191069511
+ ],
+ [
+ -121.91484378524,
+ 38.279191069511
+ ],
+ [
+ -121.91474466321,
+ 38.273544699365
+ ],
+ [
+ -121.89660533032,
+ 38.286493708233
+ ],
+ [
+ -121.86032666455,
+ 38.286117283557
+ ],
+ [
+ -121.86032666455,
+ 38.271888430789
+ ],
+ [
+ -121.85606441693,
+ 38.269328742989
+ ],
+ [
+ -121.84902675226,
+ 38.268651178571
+ ],
+ [
+ -121.84248469778,
+ 38.271361436242
+ ],
+ [
+ -121.8422864537,
+ 38.278362935223
+ ],
+ [
+ -121.82900410066,
+ 38.278362935223
+ ],
+ [
+ -121.8238497547,
+ 38.271512006112
+ ],
+ [
+ -121.80977442536,
+ 38.258036002697
+ ],
+ [
+ -121.80551217774,
+ 38.260068695949
+ ],
+ [
+ -121.80184466235,
+ 38.258111287632
+ ],
+ [
+ -121.77190980699,
+ 38.261423824784
+ ],
+ [
+ -121.77121595272,
+ 38.263230663231
+ ],
+ [
+ -121.77567644442,
+ 38.261950819331
+ ],
+ [
+ -121.77954220388,
+ 38.263381233102
+ ],
+ [
+ -121.77874922758,
+ 38.284385730046
+ ],
+ [
+ -121.76011428451,
+ 38.284988009528
+ ],
+ [
+ -121.75912306413,
+ 38.293645777085
+ ],
+ [
+ -121.74891349426,
+ 38.296732459432
+ ],
+ [
+ -121.74306529404,
+ 38.294473911373
+ ],
+ [
+ -121.74098373125,
+ 38.291763653703
+ ],
+ [
+ -121.72690840191,
+ 38.290107385127
+ ],
+ [
+ -121.7221505441,
+ 38.285063294463
+ ],
+ [
+ -121.71848302871,
+ 38.283783450563
+ ],
+ [
+ -121.71035502162,
+ 38.2761796721
+ ],
+ [
+ -121.70926467921,
+ 38.272490710271
+ ],
+ [
+ -121.69945159748,
+ 38.264886931807
+ ],
+ [
+ -121.6944954956,
+ 38.257057298538
+ ],
+ [
+ -121.69647793635,
+ 38.247345541886
+ ],
+ [
+ -121.70272262473,
+ 38.247646681628
+ ],
+ [
+ -121.70242525861,
+ 38.245990413051
+ ],
+ [
+ -121.69717179062,
+ 38.245990413051
+ ],
+ [
+ -121.69518934987,
+ 38.243807149928
+ ],
+ [
+ -121.68854817334,
+ 38.244108289669
+ ],
+ [
+ -121.68398855961,
+ 38.238236064717
+ ],
+ [
+ -121.67853684754,
+ 38.243731864993
+ ],
+ [
+ -121.67179654899,
+ 38.254648180609
+ ],
+ [
+ -121.67169742695,
+ 38.265940920901
+ ],
+ [
+ -121.66545273858,
+ 38.274673973394
+ ],
+ [
+ -121.66426327413,
+ 38.282578891599
+ ],
+ [
+ -121.6668404471,
+ 38.292892927733
+ ],
+ [
+ -121.66674132507,
+ 38.313521
+ ],
+ [
+ -121.63066090337,
+ 38.313144575324
+ ],
+ [
+ -121.63085914745,
+ 38.291763653703
+ ],
+ [
+ -121.64513272086,
+ 38.289053396033
+ ],
+ [
+ -121.64354676826,
+ 38.282277751858
+ ],
+ [
+ -121.63809505619,
+ 38.277760655741
+ ],
+ [
+ -121.64235730381,
+ 38.272114285594
+ ],
+ [
+ -121.64087047325,
+ 38.267973614154
+ ],
+ [
+ -121.65187301942,
+ 38.26164967959
+ ],
+ [
+ -121.6520712635,
+ 38.255551599832
+ ],
+ [
+ -121.65593702297,
+ 38.254121186062
+ ],
+ [
+ -121.65692824334,
+ 38.249152380333
+ ],
+ [
+ -121.65910892817,
+ 38.246667977469
+ ],
+ [
+ -121.65881156206,
+ 38.244108289669
+ ],
+ [
+ -121.66535361654,
+ 38.239892333293
+ ],
+ [
+ -121.66634483692,
+ 38.235074097435
+ ],
+ [
+ -121.67328337955,
+ 38.232213269895
+ ],
+ [
+ -121.67467108808,
+ 38.228674877936
+ ],
+ [
+ -121.67159830491,
+ 38.218285556867
+ ],
+ [
+ -121.65891068409,
+ 38.206014112416
+ ],
+ [
+ -121.65732473149,
+ 38.195173081735
+ ],
+ [
+ -121.66257819949,
+ 38.183278061961
+ ],
+ [
+ -121.66812903359,
+ 38.175222573885
+ ],
+ [
+ -121.67913157977,
+ 38.163854548658
+ ],
+ [
+ -121.68557451222,
+ 38.159713877217
+ ],
+ [
+ -121.67645528475,
+ 38.1551967811
+ ],
+ [
+ -121.68190699682,
+ 38.15120667953
+ ],
+ [
+ -121.68616924444,
+ 38.138031815856
+ ],
+ [
+ -121.6860701224,
+ 38.132234875839
+ ],
+ [
+ -121.69062973613,
+ 38.123050113734
+ ],
+ [
+ -121.66584922673,
+ 38.123501823346
+ ],
+ [
+ -121.66138873504,
+ 38.118307162812
+ ],
+ [
+ -121.65990190447,
+ 38.119888146453
+ ],
+ [
+ -121.65108004312,
+ 38.116650894235
+ ],
+ [
+ -121.6512782872,
+ 38.095947537033
+ ],
+ [
+ -121.64265466992,
+ 38.090903446369
+ ],
+ [
+ -121.63640998155,
+ 38.090000027145
+ ],
+ [
+ -121.63413017469,
+ 38.092710284815
+ ],
+ [
+ -121.6328415882,
+ 38.099485928991
+ ],
+ [
+ -121.63036353726,
+ 38.102346756532
+ ],
+ [
+ -121.61737855033,
+ 38.105734578619
+ ],
+ [
+ -121.6136119129,
+ 38.108821260966
+ ],
+ [
+ -121.60260936672,
+ 38.107993126678
+ ],
+ [
+ -121.59319277315,
+ 38.102798466143
+ ],
+ [
+ -121.57445870804,
+ 38.100314063279
+ ],
+ [
+ -121.56950260616,
+ 38.096926241191
+ ],
+ [
+ -121.58129812863,
+ 38.09391484378
+ ],
+ [
+ -121.58526301014,
+ 38.096399246644
+ ],
+ [
+ -121.60488917359,
+ 38.099862353667
+ ],
+ [
+ -121.62738987613,
+ 38.098356654962
+ ],
+ [
+ -121.63264334412,
+ 38.08864489831
+ ],
+ [
+ -121.63809505619,
+ 38.086160495446
+ ],
+ [
+ -121.6452318429,
+ 38.087440339346
+ ],
+ [
+ -121.66188434522,
+ 38.095646397291
+ ],
+ [
+ -121.67308513548,
+ 38.093538419104
+ ],
+ [
+ -121.67923070181,
+ 38.089322462728
+ ],
+ [
+ -121.68190699682,
+ 38.082019824005
+ ],
+ [
+ -121.67962718996,
+ 38.068092110978
+ ],
+ [
+ -121.68200611886,
+ 38.060638902385
+ ],
+ [
+ -121.70093842805,
+ 38.044452641299
+ ],
+ [
+ -121.73255835805,
+ 38.029019229566
+ ],
+ [
+ -121.73226099194,
+ 38.014715091862
+ ],
+ [
+ -121.73077416137,
+ 38.015016231604
+ ],
+ [
+ -121.73027855118,
+ 38.013209393157
+ ],
+ [
+ -121.72621454764,
+ 38.012983538351
+ ],
+ [
+ -121.71322956071,
+ 38.005530329758
+ ],
+ [
+ -121.71422078109,
+ 38.006584318852
+ ],
+ [
+ -121.69618057024,
+ 38.007186598334
+ ],
+ [
+ -121.69667618043,
+ 38.006057324305
+ ],
+ [
+ -121.70906643513,
+ 38.005680899628
+ ],
+ [
+ -121.70906643513,
+ 38.001314373382
+ ],
+ [
+ -121.70500243159,
+ 38.001389658317
+ ],
+ [
+ -121.70480418752,
+ 37.997926551294
+ ],
+ [
+ -121.69558583802,
+ 37.998378260906
+ ],
+ [
+ -121.68944027168,
+ 38.014037527445
+ ],
+ [
+ -121.68438504776,
+ 38.014338667186
+ ],
+ [
+ -121.67863596958,
+ 38.011026130034
+ ],
+ [
+ -121.66733605729,
+ 38.013209393157
+ ],
+ [
+ -121.63571612729,
+ 38.011703694451
+ ],
+ [
+ -121.62699338798,
+ 38.009294576522
+ ],
+ [
+ -121.62709251002,
+ 38.00613260924
+ ],
+ [
+ -121.62401972685,
+ 38.006283179111
+ ],
+ [
+ -121.62372236074,
+ 38.008165302493
+ ],
+ [
+ -121.62074869961,
+ 38.008165302493
+ ],
+ [
+ -121.62035221146,
+ 38.009445146393
+ ],
+ [
+ -121.62471358111,
+ 38.010649705357
+ ],
+ [
+ -121.6196583572,
+ 38.012908253416
+ ],
+ [
+ -121.6167838181,
+ 38.012004834192
+ ],
+ [
+ -121.61658557403,
+ 38.013886957574
+ ],
+ [
+ -121.61341366882,
+ 38.014338667186
+ ],
+ [
+ -121.60706985842,
+ 38.018780478368
+ ],
+ [
+ -121.60736722453,
+ 38.020135607203
+ ],
+ [
+ -121.6020146345,
+ 38.022243585391
+ ],
+ [
+ -121.59666204447,
+ 38.026835966443
+ ],
+ [
+ -121.58466827791,
+ 38.030299073466
+ ],
+ [
+ -121.58387530161,
+ 38.016597215244
+ ],
+ [
+ -121.58228934901,
+ 38.016747785115
+ ],
+ [
+ -121.5804060303,
+ 38.006509033917
+ ],
+ [
+ -121.5775314912,
+ 38.003572921441
+ ],
+ [
+ -121.56880875189,
+ 38.002217792605
+ ],
+ [
+ -121.57059294857,
+ 37.999055825324
+ ],
+ [
+ -121.57891919973,
+ 37.998528830777
+ ],
+ [
+ -121.57604466064,
+ 37.994839868948
+ ],
+ [
+ -121.58100076252,
+ 37.989494638543
+ ],
+ [
+ -121.58248759309,
+ 37.983923553332
+ ],
+ [
+ -121.57237714525,
+ 37.979030032538
+ ],
+ [
+ -121.57326924359,
+ 37.977674903703
+ ],
+ [
+ -121.58020778622,
+ 37.976395059803
+ ],
+ [
+ -121.57445870804,
+ 37.972480243169
+ ],
+ [
+ -121.57366573174,
+ 37.966457448346
+ ],
+ [
+ -121.5651412365,
+ 37.959832374041
+ ],
+ [
+ -121.56553772465,
+ 37.957799680789
+ ],
+ [
+ -121.57326924359,
+ 37.957347971177
+ ],
+ [
+ -121.5751525623,
+ 37.955014138183
+ ],
+ [
+ -121.5735666097,
+ 37.953734294283
+ ],
+ [
+ -121.5635552839,
+ 37.954712998442
+ ],
+ [
+ -121.56880875189,
+ 37.948464348814
+ ],
+ [
+ -121.56742104337,
+ 37.943947252697
+ ],
+ [
+ -121.56068074481,
+ 37.94756092959
+ ],
+ [
+ -121.55780620572,
+ 37.947033935043
+ ],
+ [
+ -121.55820269387,
+ 37.945377666467
+ ],
+ [
+ -121.56365440594,
+ 37.94342025815
+ ],
+ [
+ -121.56087898888,
+ 37.939881866191
+ ],
+ [
+ -121.56147372111,
+ 37.935891764621
+ ],
+ [
+ -121.55731059553,
+ 37.932278087728
+ ],
+ [
+ -121.55889654813,
+ 37.927911561481
+ ],
+ [
+ -121.55641849719,
+ 37.923319180429
+ ],
+ [
+ -121.56563684669,
+ 37.91819980483
+ ],
+ [
+ -121.57247626729,
+ 37.916995245865
+ ],
+ [
+ -121.57822534547,
+ 37.920081928212
+ ],
+ [
+ -121.59160682055,
+ 37.921512341982
+ ],
+ [
+ -121.59487784779,
+ 37.919780788471
+ ],
+ [
+ -121.60687161434,
+ 37.918802084312
+ ],
+ [
+ -121.60915142121,
+ 37.932579227469
+ ],
+ [
+ -121.62273114036,
+ 37.932805082275
+ ],
+ [
+ -121.62292938444,
+ 37.919027939118
+ ],
+ [
+ -121.62183904202,
+ 37.918952654183
+ ],
+ [
+ -121.6228302624,
+ 37.918651514442
+ ],
+ [
+ -121.62302850647,
+ 37.903594527385
+ ],
+ [
+ -121.61836977071,
+ 37.903745097256
+ ],
+ [
+ -121.61946011312,
+ 37.897797587368
+ ],
+ [
+ -121.61817152663,
+ 37.896291888663
+ ],
+ [
+ -121.62302850647,
+ 37.896442458533
+ ],
+ [
+ -121.62729075409,
+ 37.894485050216
+ ],
+ [
+ -121.62738987613,
+ 37.892602926834
+ ],
+ [
+ -121.63066090337,
+ 37.892527641898
+ ],
+ [
+ -121.63224685597,
+ 37.896291888663
+ ],
+ [
+ -121.63214773394,
+ 37.889290389681
+ ],
+ [
+ -121.64146520547,
+ 37.889139819811
+ ],
+ [
+ -121.64136608344,
+ 37.896442458533
+ ],
+ [
+ -121.65028706682,
+ 37.896517743468
+ ],
+ [
+ -121.65187301942,
+ 37.882138320829
+ ],
+ [
+ -121.65980278243,
+ 37.889892669163
+ ],
+ [
+ -121.66000102651,
+ 37.885601427852
+ ],
+ [
+ -121.67120181676,
+ 37.886580132011
+ ],
+ [
+ -121.67070620657,
+ 37.881536041347
+ ],
+ [
+ -121.67814035939,
+ 37.8810090468
+ ],
+ [
+ -121.67764474921,
+ 37.882891170182
+ ],
+ [
+ -121.68864729538,
+ 37.882966455117
+ ],
+ [
+ -121.67794211532,
+ 37.871297290149
+ ],
+ [
+ -121.65355809406,
+ 37.85691786751
+ ],
+ [
+ -121.6468177955,
+ 37.849765798658
+ ],
+ [
+ -121.64691691754,
+ 37.839376477589
+ ],
+ [
+ -121.65425194833,
+ 37.833353682766
+ ],
+ [
+ -121.65534229074,
+ 37.820254104027
+ ],
+ [
+ -121.66099224688,
+ 37.816414572327
+ ],
+ [
+ -121.66327205375,
+ 37.812424470757
+ ],
+ [
+ -121.66465976228,
+ 37.81844726558
+ ],
+ [
+ -121.66158697911,
+ 37.82514762482
+ ],
+ [
+ -121.66793078952,
+ 37.82898715652
+ ],
+ [
+ -121.66565098265,
+ 37.830643425096
+ ],
+ [
+ -121.67467108808,
+ 37.831095134708
+ ],
+ [
+ -121.68309646128,
+ 37.835612230825
+ ],
+ [
+ -121.68319558331,
+ 37.838247203559
+ ],
+ [
+ -121.68864729538,
+ 37.838322488495
+ ],
+ [
+ -121.68963851576,
+ 37.840656321488
+ ],
+ [
+ -121.68755695297,
+ 37.842011450324
+ ],
+ [
+ -121.69231481077,
+ 37.842237305129
+ ],
+ [
+ -121.69766740081,
+ 37.845850982023
+ ],
+ [
+ -121.69826213303,
+ 37.848485954758
+ ],
+ [
+ -121.69439637356,
+ 37.850669217881
+ ],
+ [
+ -121.69409900745,
+ 37.853304190616
+ ],
+ [
+ -121.69627969228,
+ 37.855939163351
+ ],
+ [
+ -121.69637881432,
+ 37.861209108821
+ ],
+ [
+ -121.69855949914,
+ 37.864145221297
+ ],
+ [
+ -121.6989559873,
+ 37.868812887284
+ ],
+ [
+ -121.7237364967,
+ 37.86888817222
+ ],
+ [
+ -121.72363737466,
+ 37.852701911134
+ ],
+ [
+ -121.77022473235,
+ 37.853228905681
+ ],
+ [
+ -121.76992736624,
+ 37.843743003835
+ ],
+ [
+ -121.76526863047,
+ 37.843743003835
+ ],
+ [
+ -121.76497126435,
+ 37.833278397831
+ ],
+ [
+ -121.76497126435,
+ 37.814833588686
+ ],
+ [
+ -121.75852833191,
+ 37.814758303751
+ ],
+ [
+ -121.75852833191,
+ 37.806928670482
+ ],
+ [
+ -121.7537704741,
+ 37.806928670482
+ ],
+ [
+ -121.7537704741,
+ 37.802787999041
+ ],
+ [
+ -121.75149066724,
+ 37.802787999041
+ ],
+ [
+ -121.74990471463,
+ 37.774255008569
+ ],
+ [
+ -121.73929865661,
+ 37.772147030381
+ ],
+ [
+ -121.67040884046,
+ 37.789462565496
+ ],
+ [
+ -121.67040884046,
+ 37.783891480285
+ ],
+ [
+ -121.66862464378,
+ 37.779600238974
+ ],
+ [
+ -121.67407635585,
+ 37.768307498682
+ ],
+ [
+ -121.67764474921,
+ 37.764618536853
+ ],
+ [
+ -121.67764474921,
+ 37.747754711349
+ ],
+ [
+ -121.67506757623,
+ 37.742560050815
+ ],
+ [
+ -121.67169742695,
+ 37.739398083533
+ ],
+ [
+ -121.65663087723,
+ 37.746926577061
+ ],
+ [
+ -121.64800725996,
+ 37.742560050815
+ ],
+ [
+ -121.64196081566,
+ 37.743087045362
+ ],
+ [
+ -121.63353544246,
+ 37.739849793145
+ ],
+ [
+ -121.62996704911,
+ 37.732547154422
+ ],
+ [
+ -121.62312762851,
+ 37.729611041946
+ ],
+ [
+ -121.61222420437,
+ 37.730815600911
+ ],
+ [
+ -121.605979516,
+ 37.728782907658
+ ],
+ [
+ -121.60221287857,
+ 37.725922080117
+ ],
+ [
+ -121.60251024469,
+ 37.670512367749
+ ],
+ [
+ -121.55691410738,
+ 37.67066293762
+ ],
+ [
+ -121.55661674127,
+ 37.542753832574
+ ],
+ [
+ -121.55047117493,
+ 37.539366010487
+ ],
+ [
+ -121.54571331713,
+ 37.532515081376
+ ],
+ [
+ -121.54065809321,
+ 37.529804823706
+ ],
+ [
+ -121.53034940129,
+ 37.527094566035
+ ],
+ [
+ -121.52886257073,
+ 37.528073270194
+ ],
+ [
+ -121.52232051625,
+ 37.524685448106
+ ],
+ [
+ -121.50150488835,
+ 37.524986587848
+ ],
+ [
+ -121.4982338611,
+ 37.522426900048
+ ],
+ [
+ -121.50239698668,
+ 37.518436798478
+ ],
+ [
+ -121.49724264073,
+ 37.512489288591
+ ],
+ [
+ -121.49535932201,
+ 37.508122762344
+ ],
+ [
+ -121.49605317628,
+ 37.504960795062
+ ],
+ [
+ -121.49317863719,
+ 37.502401107263
+ ],
+ [
+ -121.48207696897,
+ 37.501422403104
+ ],
+ [
+ -121.47940067396,
+ 37.496453597375
+ ],
+ [
+ -121.46929022612,
+ 37.4896779532
+ ],
+ [
+ -121.47117354483,
+ 37.482827024089
+ ],
+ [
+ -121.47454369411,
+ 37.479363917066
+ ],
+ [
+ -121.47771559932,
+ 37.48026733629
+ ],
+ [
+ -121.48336555546,
+ 37.475449100431
+ ],
+ [
+ -121.48673570474,
+ 37.475674955237
+ ],
+ [
+ -121.4842576538,
+ 37.466038483521
+ ],
+ [
+ -121.4750393043,
+ 37.462048381951
+ ],
+ [
+ -121.47305686355,
+ 37.456778436481
+ ],
+ [
+ -121.46958759223,
+ 37.455724447387
+ ],
+ [
+ -121.46889373797,
+ 37.453842324005
+ ],
+ [
+ -121.46403675812,
+ 37.453842324005
+ ],
+ [
+ -121.46215343941,
+ 37.442323728907
+ ],
+ [
+ -121.46235168348,
+ 37.437957202661
+ ],
+ [
+ -121.46492885646,
+ 37.437053783437
+ ],
+ [
+ -121.47028144649,
+ 37.430127569391
+ ],
+ [
+ -121.46889373797,
+ 37.425008193792
+ ],
+ [
+ -121.47256125336,
+ 37.423351925216
+ ],
+ [
+ -121.46621744295,
+ 37.415070582335
+ ],
+ [
+ -121.46354114794,
+ 37.415898716623
+ ],
+ [
+ -121.45630523919,
+ 37.406713954518
+ ],
+ [
+ -121.45561138493,
+ 37.401067584372
+ ],
+ [
+ -121.45828767994,
+ 37.398131471896
+ ],
+ [
+ -121.4566026053,
+ 37.395571784096
+ ],
+ [
+ -121.45154738138,
+ 37.394668364873
+ ],
+ [
+ -121.4481772321,
+ 37.391656967462
+ ],
+ [
+ -121.43608434351,
+ 37.396098778643
+ ],
+ [
+ -121.4125924206,
+ 37.389398419403
+ ],
+ [
+ -121.41060997984,
+ 37.386085882251
+ ],
+ [
+ -121.40912314928,
+ 37.38066536691
+ ],
+ [
+ -121.41586344784,
+ 37.375922415988
+ ],
+ [
+ -121.41933271915,
+ 37.364479105825
+ ],
+ [
+ -121.42250462436,
+ 37.363123976989
+ ],
+ [
+ -121.42369408881,
+ 37.358832735678
+ ],
+ [
+ -121.41943184119,
+ 37.351981806568
+ ],
+ [
+ -121.42072042768,
+ 37.34475445278
+ ],
+ [
+ -121.40912314928,
+ 37.330600884947
+ ],
+ [
+ -121.41110559003,
+ 37.327514202601
+ ],
+ [
+ -121.41021349169,
+ 37.325029799736
+ ],
+ [
+ -121.41189856633,
+ 37.324427520254
+ ],
+ [
+ -121.40942051539,
+ 37.321491407778
+ ],
+ [
+ -121.405753,
+ 37.311026801774
+ ],
+ [
+ -121.41834149878,
+ 37.30327245344
+ ],
+ [
+ -121.42270286843,
+ 37.299131781999
+ ],
+ [
+ -121.42349584473,
+ 37.2952922503
+ ],
+ [
+ -121.4257756516,
+ 37.296346239394
+ ],
+ [
+ -121.43142560774,
+ 37.294991110558
+ ],
+ [
+ -121.43677819778,
+ 37.291979713147
+ ],
+ [
+ -121.44351849634,
+ 37.296647379135
+ ],
+ [
+ -121.44966406267,
+ 37.293937121465
+ ],
+ [
+ -121.44867284229,
+ 37.290323444571
+ ],
+ [
+ -121.45402543232,
+ 37.284074794942
+ ],
+ [
+ -121.45808943587,
+ 37.284150079878
+ ],
+ [
+ -121.45908065624,
+ 37.282719666107
+ ],
+ [
+ -121.45392631029,
+ 37.277148580896
+ ],
+ [
+ -121.45412455436,
+ 37.273986613615
+ ],
+ [
+ -121.53371955057,
+ 37.273610188938
+ ],
+ [
+ -121.54026160506,
+ 37.286258058066
+ ],
+ [
+ -121.54729926973,
+ 37.282493811302
+ ],
+ [
+ -121.55364308014,
+ 37.28219267156
+ ],
+ [
+ -121.55602200904,
+ 37.280461118049
+ ],
+ [
+ -121.56603333484,
+ 37.294614685882
+ ],
+ [
+ -121.56742104337,
+ 37.292958417306
+ ],
+ [
+ -121.57029558246,
+ 37.290925724053
+ ],
+ [
+ -121.57663939287,
+ 37.290097589765
+ ],
+ [
+ -121.57981129807,
+ 37.286258058066
+ ],
+ [
+ -121.60003219375,
+ 37.289645880153
+ ],
+ [
+ -121.61608996384,
+ 37.286785052613
+ ],
+ [
+ -121.62005484535,
+ 37.290474014442
+ ],
+ [
+ -121.62620041168,
+ 37.291226863794
+ ],
+ [
+ -121.62857934058,
+ 37.2901728747
+ ],
+ [
+ -121.62818285243,
+ 37.288441321189
+ ],
+ [
+ -121.60885405509,
+ 37.268340243468
+ ],
+ [
+ -121.61182771622,
+ 37.26209159384
+ ],
+ [
+ -121.61390927901,
+ 37.260510610199
+ ],
+ [
+ -121.61549523161,
+ 37.261263459552
+ ],
+ [
+ -121.61708118422,
+ 37.255692374341
+ ],
+ [
+ -121.624416215,
+ 37.254939524988
+ ],
+ [
+ -121.62372236074,
+ 37.252153982383
+ ],
+ [
+ -121.62957056096,
+ 37.253358541347
+ ],
+ [
+ -121.63750032397,
+ 37.258553201882
+ ],
+ [
+ -121.64622306328,
+ 37.260736465005
+ ],
+ [
+ -121.64741252773,
+ 37.263597292546
+ ],
+ [
+ -121.65236862961,
+ 37.264199572028
+ ],
+ [
+ -121.65900980613,
+ 37.260962319811
+ ],
+ [
+ -121.65712648742,
+ 37.25682164837
+ ],
+ [
+ -121.65910892817,
+ 37.256068799017
+ ],
+ [
+ -121.66753430137,
+ 37.259607190976
+ ],
+ [
+ -121.67011147435,
+ 37.259155481364
+ ],
+ [
+ -121.67566230845,
+ 37.265027706316
+ ],
+ [
+ -121.67397723381,
+ 37.259004911493
+ ],
+ [
+ -121.67774387124,
+ 37.255315949664
+ ],
+ [
+ -121.67734738309,
+ 37.252304552253
+ ],
+ [
+ -121.66872376582,
+ 37.24086124209
+ ],
+ [
+ -121.66882288786,
+ 37.226632389322
+ ],
+ [
+ -121.67477021011,
+ 37.223244567234
+ ],
+ [
+ -121.6668404471,
+ 37.215113794223
+ ],
+ [
+ -121.66713781322,
+ 37.213457525647
+ ],
+ [
+ -121.66228083337,
+ 37.211198977589
+ ],
+ [
+ -121.66584922673,
+ 37.205552607442
+ ],
+ [
+ -121.67140006084,
+ 37.201186081196
+ ],
+ [
+ -121.67764474921,
+ 37.200132092102
+ ],
+ [
+ -121.67774387124,
+ 37.197873544044
+ ],
+ [
+ -121.69409900745,
+ 37.198174683785
+ ],
+ [
+ -121.70341647899,
+ 37.200132092102
+ ],
+ [
+ -121.71065238774,
+ 37.20894042953
+ ],
+ [
+ -121.71471639128,
+ 37.20894042953
+ ],
+ [
+ -121.71441902516,
+ 37.207886440436
+ ],
+ [
+ -121.72343913059,
+ 37.215941928512
+ ],
+ [
+ -121.72839523247,
+ 37.215941928512
+ ],
+ [
+ -121.74683193147,
+ 37.230321351151
+ ],
+ [
+ -121.75119330112,
+ 37.226406534516
+ ],
+ [
+ -121.74653456536,
+ 37.222868142558
+ ],
+ [
+ -121.75922218617,
+ 37.218953325923
+ ],
+ [
+ -121.75852833191,
+ 37.217824051894
+ ],
+ [
+ -121.76100638285,
+ 37.216544207994
+ ],
+ [
+ -121.76269145749,
+ 37.217824051894
+ ],
+ [
+ -121.76556599658,
+ 37.214360944871
+ ],
+ [
+ -121.76804404752,
+ 37.216995917605
+ ],
+ [
+ -121.77081946457,
+ 37.217372342282
+ ],
+ [
+ -121.7782536174,
+ 37.208187580177
+ ],
+ [
+ -121.77974044796,
+ 37.205176182766
+ ],
+ [
+ -121.77706415294,
+ 37.198626393396
+ ],
+ [
+ -121.77964132592,
+ 37.196443130273
+ ],
+ [
+ -121.77448697997,
+ 37.193205878056
+ ],
+ [
+ -121.76715194918,
+ 37.192076604027
+ ],
+ [
+ -121.7645747762,
+ 37.190194480645
+ ],
+ [
+ -121.76308794564,
+ 37.191022614933
+ ],
+ [
+ -121.7637817999,
+ 37.18898992168
+ ],
+ [
+ -121.75971779636,
+ 37.18612909414
+ ],
+ [
+ -121.7598169184,
+ 37.183494121405
+ ],
+ [
+ -121.76170023711,
+ 37.180783863734
+ ],
+ [
+ -121.76556599658,
+ 37.180558008929
+ ],
+ [
+ -121.76388092194,
+ 37.177471326582
+ ],
+ [
+ -121.76596248473,
+ 37.179654589705
+ ],
+ [
+ -121.76735019326,
+ 37.178148891
+ ],
+ [
+ -121.7737931257,
+ 37.181386143217
+ ],
+ [
+ -121.77329751551,
+ 37.183268266599
+ ],
+ [
+ -121.78182201075,
+ 37.182816556987
+ ],
+ [
+ -121.78430006169,
+ 37.180633293864
+ ],
+ [
+ -121.78271410909,
+ 37.181235573346
+ ],
+ [
+ -121.78241674298,
+ 37.179504019835
+ ],
+ [
+ -121.77954220388,
+ 37.179052310223
+ ],
+ [
+ -121.78529128207,
+ 37.178826455417
+ ],
+ [
+ -121.78519216003,
+ 37.175513918265
+ ],
+ [
+ -121.78370532946,
+ 37.175438633329
+ ],
+ [
+ -121.78786845505,
+ 37.171900241371
+ ],
+ [
+ -121.79649207232,
+ 37.172351950983
+ ],
+ [
+ -121.79867275715,
+ 37.171072107083
+ ],
+ [
+ -121.79976309956,
+ 37.168211279542
+ ],
+ [
+ -121.80352973699,
+ 37.165651591743
+ ],
+ [
+ -121.79877187918,
+ 37.15706910912
+ ],
+ [
+ -121.79916836733,
+ 37.155412840544
+ ],
+ [
+ -121.80184466235,
+ 37.156391544703
+ ],
+ [
+ -121.80501656755,
+ 37.15307900755
+ ],
+ [
+ -121.80808935072,
+ 37.152627297939
+ ],
+ [
+ -121.81284720853,
+ 37.153907141838
+ ],
+ [
+ -121.81473052724,
+ 37.151799163651
+ ],
+ [
+ -121.81720857818,
+ 37.142689686481
+ ],
+ [
+ -121.80422359125,
+ 37.135763472435
+ ],
+ [
+ -121.80372798107,
+ 37.102562815976
+ ],
+ [
+ -121.80253851661,
+ 37.100379552852
+ ],
+ [
+ -121.8330681042,
+ 37.100605407658
+ ],
+ [
+ -121.83584352126,
+ 37.109790169763
+ ],
+ [
+ -121.83842069423,
+ 37.10647763261
+ ],
+ [
+ -121.84813465392,
+ 37.105423643516
+ ],
+ [
+ -121.84298030796,
+ 37.10120768714
+ ],
+ [
+ -121.84397152834,
+ 37.097594010247
+ ],
+ [
+ -121.84625133521,
+ 37.096991730765
+ ],
+ [
+ -121.84416977242,
+ 37.094733182706
+ ],
+ [
+ -121.83415844662,
+ 37.091194790748
+ ],
+ [
+ -121.83039180919,
+ 37.088108108401
+ ],
+ [
+ -121.82424624285,
+ 37.08780696866
+ ],
+ [
+ -121.82355238859,
+ 37.086000130213
+ ],
+ [
+ -121.81819979856,
+ 37.083741582155
+ ],
+ [
+ -121.81651472392,
+ 37.080353760067
+ ],
+ [
+ -121.81720857818,
+ 37.077869357203
+ ],
+ [
+ -121.81264896445,
+ 37.075384954338
+ ],
+ [
+ -121.8090805711,
+ 37.069286874581
+ ],
+ [
+ -121.81284720853,
+ 37.065221488075
+ ],
+ [
+ -121.81681209003,
+ 37.064920348334
+ ],
+ [
+ -121.82523746323,
+ 37.067931745745
+ ],
+ [
+ -121.83009444307,
+ 37.066953041587
+ ],
+ [
+ -121.83009444307,
+ 37.06514620314
+ ],
+ [
+ -121.84159259944,
+ 37.070717288351
+ ],
+ [
+ -121.84099786721,
+ 37.065070918205
+ ],
+ [
+ -121.84416977242,
+ 37.068458740292
+ ],
+ [
+ -121.84902675226,
+ 37.068232885487
+ ],
+ [
+ -121.84863026411,
+ 37.071093713027
+ ],
+ [
+ -121.85576705082,
+ 37.072900551474
+ ],
+ [
+ -121.85883983398,
+ 37.075761379015
+ ],
+ [
+ -121.8583442238,
+ 37.084946141119
+ ],
+ [
+ -121.8899641538,
+ 37.093829763483
+ ],
+ [
+ -121.89432552345,
+ 37.092474634648
+ ],
+ [
+ -121.90255265258,
+ 37.086451839825
+ ],
+ [
+ -121.91732183618,
+ 37.081708888902
+ ],
+ [
+ -121.91910603286,
+ 37.078622206556
+ ],
+ [
+ -121.92564808734,
+ 37.074330965244
+ ],
+ [
+ -121.92465686697,
+ 37.073427546021
+ ],
+ [
+ -121.92663930772,
+ 37.07056671848
+ ],
+ [
+ -121.92485511104,
+ 37.068910449904
+ ],
+ [
+ -121.93774097593,
+ 37.069813869128
+ ],
+ [
+ -121.9408137591,
+ 37.065823767558
+ ],
+ [
+ -121.94180497948,
+ 37.057166
+ ],
+ [
+ -121.94596810506,
+ 37.064393353787
+ ],
+ [
+ -121.94834703396,
+ 37.065522627816
+ ],
+ [
+ -121.94626547117,
+ 37.068534025228
+ ],
+ [
+ -121.94636459321,
+ 37.076137803691
+ ],
+ [
+ -121.95350137992,
+ 37.076213088627
+ ],
+ [
+ -121.95459172233,
+ 37.081708888902
+ ],
+ [
+ -121.96281885145,
+ 37.089162097495
+ ],
+ [
+ -121.95855660384,
+ 37.09563660193
+ ],
+ [
+ -121.97312754337,
+ 37.104369654422
+ ],
+ [
+ -121.97530822819,
+ 37.104294369487
+ ],
+ [
+ -121.9768941808,
+ 37.109489030022
+ ],
+ [
+ -121.98393184547,
+ 37.113479131592
+ ],
+ [
+ -121.98680638456,
+ 37.114006126139
+ ],
+ [
+ -121.98650901845,
+ 37.111220583533
+ ],
+ [
+ -121.98829321512,
+ 37.112048717821
+ ],
+ [
+ -121.99077126606,
+ 37.104520224293
+ ],
+ [
+ -121.99196073052,
+ 37.105122503775
+ ],
+ [
+ -121.99186160848,
+ 37.109263175216
+ ],
+ [
+ -121.99562824591,
+ 37.110016024569
+ ],
+ [
+ -121.99632210017,
+ 37.111521723274
+ ],
+ [
+ -121.99493439164,
+ 37.112876852109
+ ],
+ [
+ -121.99800717481,
+ 37.119577211349
+ ],
+ [
+ -121.99671858832,
+ 37.113479131592
+ ],
+ [
+ -122.01128952785,
+ 37.113554416527
+ ],
+ [
+ -122.01406494491,
+ 37.116716383809
+ ],
+ [
+ -122.01376757879,
+ 37.118071512644
+ ],
+ [
+ -122.00990181933,
+ 37.116641098873
+ ],
+ [
+ -122.01257811434,
+ 37.120028920961
+ ],
+ [
+ -122.0124789923,
+ 37.127783269295
+ ],
+ [
+ -122.01822807049,
+ 37.12770798436
+ ],
+ [
+ -122.01763333826,
+ 37.131171091383
+ ],
+ [
+ -122.02804115221,
+ 37.135311762824
+ ],
+ [
+ -122.0269508098,
+ 37.13711860127
+ ],
+ [
+ -122.02863588444,
+ 37.137495025947
+ ],
+ [
+ -122.02823939629,
+ 37.138925439717
+ ],
+ [
+ -122.03240252187,
+ 37.1382478753
+ ],
+ [
+ -122.03220427779,
+ 37.135537617629
+ ],
+ [
+ -122.03636740337,
+ 37.13711860127
+ ],
+ [
+ -122.03973755265,
+ 37.133354354506
+ ],
+ [
+ -122.04320682397,
+ 37.134860053212
+ ],
+ [
+ -122.04489189861,
+ 37.133655494247
+ ],
+ [
+ -122.04489189861,
+ 37.130719381771
+ ],
+ [
+ -122.04766731566,
+ 37.130644096836
+ ],
+ [
+ -122.04875765807,
+ 37.127632699425
+ ],
+ [
+ -122.05301990569,
+ 37.12514829656
+ ],
+ [
+ -122.05401112607,
+ 37.127632699425
+ ],
+ [
+ -122.06144527889,
+ 37.124470732143
+ ],
+ [
+ -122.05629093293,
+ 37.128009124101
+ ],
+ [
+ -122.06144527889,
+ 37.124470732143
+ ],
+ [
+ -122.05837249572,
+ 37.128009124101
+ ],
+ [
+ -122.05827337369,
+ 37.132074510606
+ ],
+ [
+ -122.08573017811,
+ 37.139000724652
+ ],
+ [
+ -122.09752570059,
+ 37.117996227709
+ ],
+ [
+ -122.10149058209,
+ 37.11829736745
+ ],
+ [
+ -122.1017879482,
+ 37.115060115233
+ ],
+ [
+ -122.09663360225,
+ 37.113102706915
+ ],
+ [
+ -122.1009949719,
+ 37.108962035475
+ ],
+ [
+ -122.11269137234,
+ 37.112425142498
+ ],
+ [
+ -122.11427732495,
+ 37.111220583533
+ ],
+ [
+ -122.11437644698,
+ 37.108585610798
+ ],
+ [
+ -122.10763614842,
+ 37.107531621704
+ ],
+ [
+ -122.11368259272,
+ 37.104896648969
+ ],
+ [
+ -122.12210796592,
+ 37.103917944811
+ ],
+ [
+ -122.11645800977,
+ 37.10376737494
+ ],
+ [
+ -122.1194316709,
+ 37.101734681687
+ ],
+ [
+ -122.13905783435,
+ 37.104369654422
+ ],
+ [
+ -122.14431130235,
+ 37.111070013663
+ ],
+ [
+ -122.14391481419,
+ 37.113328561721
+ ],
+ [
+ -122.15491736037,
+ 37.120857055249
+ ],
+ [
+ -122.1610629267,
+ 37.128009124101
+ ],
+ [
+ -122.16086468263,
+ 37.129740677613
+ ],
+ [
+ -122.16681200489,
+ 37.133279069571
+ ],
+ [
+ -122.16701024896,
+ 37.135462332694
+ ],
+ [
+ -122.17117337454,
+ 37.136742176594
+ ],
+ [
+ -122.17325493733,
+ 37.139828858941
+ ],
+ [
+ -122.17801279514,
+ 37.138473730105
+ ],
+ [
+ -122.18931270743,
+ 37.142539116611
+ ],
+ [
+ -122.19981964342,
+ 37.142840256352
+ ],
+ [
+ -122.19753983655,
+ 37.150067610139
+ ],
+ [
+ -122.20527135548,
+ 37.150669889621
+ ],
+ [
+ -122.20675818605,
+ 37.152476728068
+ ],
+ [
+ -122.20745204031,
+ 37.16090864082
+ ],
+ [
+ -122.21181340997,
+ 37.160983925755
+ ],
+ [
+ -122.21181340997,
+ 37.164823457454
+ ],
+ [
+ -122.20289242658,
+ 37.16489874239
+ ],
+ [
+ -122.21548092536,
+ 37.168361849413
+ ],
+ [
+ -122.22787118006,
+ 37.164447032778
+ ],
+ [
+ -122.230349231,
+ 37.160758070949
+ ],
+ [
+ -122.24164914329,
+ 37.16105921069
+ ],
+ [
+ -122.24264036367,
+ 37.190043910774
+ ],
+ [
+ -122.26890770364,
+ 37.189818055968
+ ],
+ [
+ -122.28853386709,
+ 37.186731373622
+ ],
+ [
+ -122.31767574615,
+ 37.186957228428
+ ],
+ [
+ -122.31182754593,
+ 37.147507922339
+ ],
+ [
+ -122.28942596543,
+ 37.113479131592
+ ],
+ [
+ -122.29299435878,
+ 37.107381051834
+ ],
+ [
+ -122.30597934571,
+ 37.116415244068
+ ],
+ [
+ -122.31153017982,
+ 37.117920942773
+ ],
+ [
+ -122.31559418336,
+ 37.116264674197
+ ],
+ [
+ -122.31846872245,
+ 37.11701752355
+ ],
+ [
+ -122.32927302455,
+ 37.112274572627
+ ],
+ [
+ -122.33204844161,
+ 37.116942238615
+ ],
+ [
+ -122.33690542145,
+ 37.117092808485
+ ],
+ [
+ -122.33938347239,
+ 37.120932340185
+ ],
+ [
+ -122.33720278756,
+ 37.13026767216
+ ],
+ [
+ -122.33829312998,
+ 37.136215182047
+ ],
+ [
+ -122.34315010982,
+ 37.140431138423
+ ],
+ [
+ -122.34582640484,
+ 37.145249374281
+ ],
+ [
+ -122.3517737271,
+ 37.145249374281
+ ],
+ [
+ -122.35147636098,
+ 37.146529218181
+ ],
+ [
+ -122.35435090007,
+ 37.146830357922
+ ],
+ [
+ -122.3557386086,
+ 37.14908890598
+ ],
+ [
+ -122.36089295456,
+ 37.149691185463
+ ],
+ [
+ -122.35960436807,
+ 37.152853152744
+ ],
+ [
+ -122.36128944271,
+ 37.160607501079
+ ],
+ [
+ -122.36763325312,
+ 37.17287894553
+ ],
+ [
+ -122.37021042609,
+ 37.173556509947
+ ],
+ [
+ -122.37923053152,
+ 37.181235573346
+ ],
+ [
+ -122.38121297227,
+ 37.180783863734
+ ],
+ [
+ -122.38666468434,
+ 37.183418836469
+ ],
+ [
+ -122.39171990826,
+ 37.183192981663
+ ],
+ [
+ -122.39469356939,
+ 37.181386143217
+ ],
+ [
+ -122.39429708124,
+ 37.182816556987
+ ],
+ [
+ -122.39707249829,
+ 37.185376244787
+ ],
+ [
+ -122.39796459663,
+ 37.192227173897
+ ],
+ [
+ -122.40510138334,
+ 37.195916135726
+ ],
+ [
+ -122.40520050538,
+ 37.206907736278
+ ],
+ [
+ -122.40698470205,
+ 37.208187580177
+ ],
+ [
+ -122.40777767835,
+ 37.213457525647
+ ],
+ [
+ -122.40916538688,
+ 37.213833950324
+ ],
+ [
+ -122.40728206817,
+ 37.218652186182
+ ],
+ [
+ -122.41065221744,
+ 37.224072701522
+ ],
+ [
+ -122.4089671428,
+ 37.225503115292
+ ],
+ [
+ -122.41154431578,
+ 37.226481819451
+ ],
+ [
+ -122.41134607171,
+ 37.228363942833
+ ],
+ [
+ -122.41590568544,
+ 37.23288103895
+ ],
+ [
+ -122.41570744136,
+ 37.237021710391
+ ],
+ [
+ -122.41917671268,
+ 37.241614091443
+ ]
+ ],
+ [
+ [
+ -122.1663163947,
+ 37.923018040688
+ ],
+ [
+ -122.14827618385,
+ 37.923846174976
+ ],
+ [
+ -122.13727363767,
+ 37.918049234959
+ ],
+ [
+ -122.12577548131,
+ 37.9183503747
+ ],
+ [
+ -122.12646933557,
+ 37.923018040688
+ ],
+ [
+ -122.11814308441,
+ 37.924147314717
+ ],
+ [
+ -122.11794484034,
+ 37.929868969799
+ ],
+ [
+ -122.11338522661,
+ 37.931525238375
+ ],
+ [
+ -122.11070893159,
+ 37.934762490592
+ ],
+ [
+ -122.11427732495,
+ 37.934536635786
+ ],
+ [
+ -122.11606152162,
+ 37.940032436062
+ ],
+ [
+ -122.11923342683,
+ 37.941387564897
+ ],
+ [
+ -122.10961858918,
+ 37.945227096596
+ ],
+ [
+ -122.11675537589,
+ 37.946506940496
+ ],
+ [
+ -122.117052742,
+ 37.949443052972
+ ],
+ [
+ -122.11675537589,
+ 37.951475746225
+ ],
+ [
+ -122.12042289128,
+ 37.953508439477
+ ],
+ [
+ -122.1254781152,
+ 37.953433154542
+ ],
+ [
+ -122.12755967799,
+ 37.950798181807
+ ],
+ [
+ -122.1286500204,
+ 37.943947252697
+ ],
+ [
+ -122.13162368153,
+ 37.947711499461
+ ],
+ [
+ -122.13697627156,
+ 37.942366269056
+ ],
+ [
+ -122.14431130235,
+ 37.945227096596
+ ],
+ [
+ -122.14956477034,
+ 37.943344973214
+ ],
+ [
+ -122.15303404166,
+ 37.935214200204
+ ],
+ [
+ -122.14906916015,
+ 37.935741194751
+ ],
+ [
+ -122.14817706181,
+ 37.932353372663
+ ],
+ [
+ -122.15214194332,
+ 37.928589125899
+ ],
+ [
+ -122.16235151319,
+ 37.925803583293
+ ],
+ [
+ -122.16572166247,
+ 37.93032067941
+ ],
+ [
+ -122.17384966956,
+ 37.931374668504
+ ],
+ [
+ -122.18643816834,
+ 37.93830088255
+ ],
+ [
+ -122.20190120621,
+ 37.938225597615
+ ],
+ [
+ -122.20299154862,
+ 37.939505441515
+ ],
+ [
+ -122.20655994197,
+ 37.937171608521
+ ],
+ [
+ -122.20467662326,
+ 37.939806581256
+ ],
+ [
+ -122.2087406268,
+ 37.948012639202
+ ],
+ [
+ -122.2195449289,
+ 37.948012639202
+ ],
+ [
+ -122.21944580687,
+ 37.957122116371
+ ],
+ [
+ -122.20774940643,
+ 37.956896261565
+ ],
+ [
+ -122.20685730809,
+ 37.965930453799
+ ],
+ [
+ -122.22142824762,
+ 37.984525832814
+ ],
+ [
+ -122.23411586843,
+ 37.984450547879
+ ],
+ [
+ -122.24977715038,
+ 37.993033030501
+ ],
+ [
+ -122.25047100464,
+ 37.991075622184
+ ],
+ [
+ -122.24055880088,
+ 37.985956246584
+ ],
+ [
+ -122.23738689568,
+ 37.981815575144
+ ],
+ [
+ -122.24006319069,
+ 37.977825473574
+ ],
+ [
+ -122.24412719423,
+ 37.97549164058
+ ],
+ [
+ -122.24174826533,
+ 37.971802678751
+ ],
+ [
+ -122.24769558759,
+ 37.972179103428
+ ],
+ [
+ -122.24313597386,
+ 37.971125114334
+ ],
+ [
+ -122.24313597386,
+ 37.967812577181
+ ],
+ [
+ -122.24680348925,
+ 37.964048330417
+ ],
+ [
+ -122.23758513975,
+ 37.9582513904
+ ],
+ [
+ -122.24343333997,
+ 37.954487143636
+ ],
+ [
+ -122.24670436721,
+ 37.955239992989
+ ],
+ [
+ -122.24908329612,
+ 37.952303880513
+ ],
+ [
+ -122.25602183875,
+ 37.94884077349
+ ],
+ [
+ -122.25364290985,
+ 37.945754091143
+ ],
+ [
+ -122.25522886245,
+ 37.946055230884
+ ],
+ [
+ -122.25602183875,
+ 37.944398962308
+ ],
+ [
+ -122.26187003897,
+ 37.944700102049
+ ],
+ [
+ -122.27108838847,
+ 37.939806581256
+ ],
+ [
+ -122.25463413022,
+ 37.920608922759
+ ],
+ [
+ -122.25423764207,
+ 37.917672810283
+ ],
+ [
+ -122.25106573687,
+ 37.915113122483
+ ],
+ [
+ -122.25304817762,
+ 37.911574730525
+ ],
+ [
+ -122.2495789063,
+ 37.911123020913
+ ],
+ [
+ -122.24759646555,
+ 37.908864472855
+ ],
+ [
+ -122.24779470963,
+ 37.905627220638
+ ],
+ [
+ -122.2448210485,
+ 37.904874371285
+ ],
+ [
+ -122.25086749279,
+ 37.90095955465
+ ],
+ [
+ -122.25265168947,
+ 37.896442458533
+ ],
+ [
+ -122.25294905558,
+ 37.893732200863
+ ],
+ [
+ -122.24947978427,
+ 37.893054636445
+ ],
+ [
+ -122.24947978427,
+ 37.888236400587
+ ],
+ [
+ -122.24194650941,
+ 37.881912466023
+ ],
+ [
+ -122.23867548216,
+ 37.883342879794
+ ],
+ [
+ -122.22707820376,
+ 37.8797292029
+ ],
+ [
+ -122.22172561373,
+ 37.87957863303
+ ],
+ [
+ -122.22212210188,
+ 37.882063035894
+ ],
+ [
+ -122.22727644784,
+ 37.891850077481
+ ],
+ [
+ -122.21429146091,
+ 37.901486549197
+ ],
+ [
+ -122.21746336611,
+ 37.903820382191
+ ],
+ [
+ -122.22678083765,
+ 37.905551935702
+ ],
+ [
+ -122.23252991583,
+ 37.909692607143
+ ],
+ [
+ -122.23441323455,
+ 37.916995245865
+ ],
+ [
+ -122.23233167176,
+ 37.916392966383
+ ],
+ [
+ -122.2295562547,
+ 37.911574730525
+ ],
+ [
+ -122.22767293599,
+ 37.908412763243
+ ],
+ [
+ -122.22271683411,
+ 37.906530639861
+ ],
+ [
+ -122.21577829147,
+ 37.907132919343
+ ],
+ [
+ -122.21300287442,
+ 37.90750934402
+ ],
+ [
+ -122.21072306755,
+ 37.910972451043
+ ],
+ [
+ -122.2163730237,
+ 37.91548954716
+ ],
+ [
+ -122.21587741351,
+ 37.921662911853
+ ],
+ [
+ -122.21320111849,
+ 37.924373169523
+ ],
+ [
+ -122.20893887088,
+ 37.921135917306
+ ],
+ [
+ -122.21330024053,
+ 37.920985347435
+ ],
+ [
+ -122.21240814219,
+ 37.915338977289
+ ],
+ [
+ -122.20596520975,
+ 37.911725300395
+ ],
+ [
+ -122.20378452492,
+ 37.914811982742
+ ],
+ [
+ -122.20368540288,
+ 37.909692607143
+ ],
+ [
+ -122.20011700953,
+ 37.917522240412
+ ],
+ [
+ -122.19585476191,
+ 37.922114621465
+ ],
+ [
+ -122.17404791363,
+ 37.917898665089
+ ],
+ [
+ -122.16453219802,
+ 37.921286487176
+ ],
+ [
+ -122.1663163947,
+ 37.923018040688
+ ]
+ ],
+ [
+ [
+ -122.23431411251,
+ 38.021791875779
+ ],
+ [
+ -122.2295562547,
+ 38.021641305908
+ ],
+ [
+ -122.22965537674,
+ 38.014715091862
+ ],
+ [
+ -122.22519488505,
+ 38.01396224251
+ ],
+ [
+ -122.22569049524,
+ 38.011101414969
+ ],
+ [
+ -122.22023878317,
+ 38.00884286691
+ ],
+ [
+ -122.21617477962,
+ 38.008993436781
+ ],
+ [
+ -122.21597653555,
+ 38.007186598334
+ ],
+ [
+ -122.2139940948,
+ 38.007111313399
+ ],
+ [
+ -122.20507311141,
+ 38.008918151846
+ ],
+ [
+ -122.19040304984,
+ 38.015693796021
+ ],
+ [
+ -122.198729301,
+ 38.025405552673
+ ],
+ [
+ -122.20606433179,
+ 38.028191095278
+ ],
+ [
+ -122.20725379624,
+ 38.041591813758
+ ],
+ [
+ -122.20616345382,
+ 38.046184194811
+ ],
+ [
+ -122.21240814219,
+ 38.045958340005
+ ],
+ [
+ -122.21577829147,
+ 38.041817668564
+ ],
+ [
+ -122.21964405094,
+ 38.045958340005
+ ],
+ [
+ -122.22113088151,
+ 38.045356060523
+ ],
+ [
+ -122.21974317298,
+ 38.042344663111
+ ],
+ [
+ -122.22103175947,
+ 38.041064819211
+ ],
+ [
+ -122.22737556988,
+ 38.04475378104
+ ],
+ [
+ -122.23193518361,
+ 38.04347393714
+ ],
+ [
+ -122.23411586843,
+ 38.044226786493
+ ],
+ [
+ -122.23431411251,
+ 38.021791875779
+ ]
+ ],
+ [
+ [
+ -122.00573869375,
+ 37.994087019595
+ ],
+ [
+ -121.9776871571,
+ 37.973760087069
+ ],
+ [
+ -121.97550647227,
+ 37.97549164058
+ ],
+ [
+ -121.9700547602,
+ 37.971727393816
+ ],
+ [
+ -121.96836968556,
+ 37.973157807586
+ ],
+ [
+ -121.96390919387,
+ 37.972856667845
+ ],
+ [
+ -121.95360050195,
+ 37.964876464705
+ ],
+ [
+ -121.94527425079,
+ 37.96352133587
+ ],
+ [
+ -121.94041727095,
+ 37.967737292246
+ ],
+ [
+ -121.93912868446,
+ 37.971576823945
+ ],
+ [
+ -121.93912868446,
+ 37.979858166826
+ ],
+ [
+ -121.94220146763,
+ 37.981665005273
+ ],
+ [
+ -121.9416067354,
+ 37.983396558785
+ ],
+ [
+ -121.93199189775,
+ 37.983321273849
+ ],
+ [
+ -121.93109979941,
+ 37.999658104806
+ ],
+ [
+ -121.93248750794,
+ 38.003497636505
+ ],
+ [
+ -121.93595677926,
+ 38.003949346117
+ ],
+ [
+ -121.93298311813,
+ 38.010499135487
+ ],
+ [
+ -121.93357785035,
+ 38.011929549257
+ ],
+ [
+ -121.94180497948,
+ 38.012080119128
+ ],
+ [
+ -121.94091288114,
+ 38.006810173658
+ ],
+ [
+ -121.9460672271,
+ 38.003347066635
+ ],
+ [
+ -121.94814878989,
+ 37.994990438818
+ ],
+ [
+ -121.94993298656,
+ 37.997625411553
+ ],
+ [
+ -121.9568715292,
+ 37.994990438818
+ ],
+ [
+ -121.96113377681,
+ 37.998754685582
+ ],
+ [
+ -121.96153026496,
+ 38.00470219547
+ ],
+ [
+ -121.96628812277,
+ 38.006057324305
+ ],
+ [
+ -121.96827056352,
+ 38.003648206376
+ ],
+ [
+ -121.96718022111,
+ 38.008240587428
+ ],
+ [
+ -121.97491174004,
+ 38.006207894175
+ ],
+ [
+ -121.97510998412,
+ 38.007788877816
+ ],
+ [
+ -121.97957047581,
+ 38.008090017558
+ ],
+ [
+ -121.98105730638,
+ 38.009520431328
+ ],
+ [
+ -121.97867837747,
+ 38.00884286691
+ ],
+ [
+ -121.97857925544,
+ 38.011854264322
+ ],
+ [
+ -121.98373360139,
+ 38.011778979386
+ ],
+ [
+ -121.98254413694,
+ 38.010423850551
+ ],
+ [
+ -121.98938355754,
+ 38.014338667186
+ ],
+ [
+ -121.99186160848,
+ 38.014188097315
+ ],
+ [
+ -121.99582648998,
+ 38.007111313399
+ ],
+ [
+ -121.99790805277,
+ 38.008617012105
+ ],
+ [
+ -122.00098083594,
+ 37.999356965065
+ ],
+ [
+ -122.00663079208,
+ 38.000260384288
+ ],
+ [
+ -122.0061351819,
+ 37.997625411553
+ ],
+ [
+ -122.01069479563,
+ 37.994087019595
+ ],
+ [
+ -122.0077211345,
+ 37.993033030501
+ ],
+ [
+ -122.00573869375,
+ 37.994087019595
+ ]
+ ],
+ [
+ [
+ -122.37942877559,
+ 37.826803893396
+ ],
+ [
+ -122.3781401891,
+ 37.83041757029
+ ],
+ [
+ -122.37328320926,
+ 37.832450263543
+ ],
+ [
+ -122.36743500904,
+ 37.829438866131
+ ],
+ [
+ -122.36644378866,
+ 37.830793994966
+ ],
+ [
+ -122.36545256829,
+ 37.829062441455
+ ],
+ [
+ -122.36703852089,
+ 37.828610731843
+ ],
+ [
+ -122.36188417493,
+ 37.821533947927
+ ],
+ [
+ -122.3633710055,
+ 37.821533947927
+ ],
+ [
+ -122.36208241901,
+ 37.820781098574
+ ],
+ [
+ -122.36356924957,
+ 37.820856383509
+ ],
+ [
+ -122.36237978512,
+ 37.820103534156
+ ],
+ [
+ -122.36406485976,
+ 37.820103534156
+ ],
+ [
+ -122.36465959199,
+ 37.817920271033
+ ],
+ [
+ -122.37110252443,
+ 37.816038147651
+ ],
+ [
+ -122.36763325312,
+ 37.812424470757
+ ],
+ [
+ -122.35841490362,
+ 37.81430659414
+ ],
+ [
+ -122.36089295456,
+ 37.812499755693
+ ],
+ [
+ -122.36218154105,
+ 37.807003955417
+ ],
+ [
+ -122.36753413108,
+ 37.80775680477
+ ],
+ [
+ -122.37268847703,
+ 37.810617632311
+ ],
+ [
+ -122.37169725666,
+ 37.815134728428
+ ],
+ [
+ -122.37942877559,
+ 37.826803893396
+ ]
+ ],
+ [
+ [
+ -122.30141973198,
+ 38.105508723814
+ ],
+ [
+ -122.29021894173,
+ 38.114618200983
+ ],
+ [
+ -122.28823650098,
+ 38.11258550773
+ ],
+ [
+ -122.28813737894,
+ 38.116876749041
+ ],
+ [
+ -122.28734440264,
+ 38.116500324365
+ ],
+ [
+ -122.28308215502,
+ 38.118081308006
+ ],
+ [
+ -122.28149620242,
+ 38.118608302553
+ ],
+ [
+ -122.28119883631,
+ 38.118457732682
+ ],
+ [
+ -122.27832429721,
+ 38.113639496824
+ ],
+ [
+ -122.28119883631,
+ 38.118457732682
+ ],
+ [
+ -122.28288391095,
+ 38.11800602307
+ ],
+ [
+ -122.27981112778,
+ 38.112736077601
+ ],
+ [
+ -122.2680156053,
+ 38.100012923538
+ ],
+ [
+ -122.26890770364,
+ 38.098356654962
+ ],
+ [
+ -122.26742087308,
+ 38.098883649509
+ ],
+ [
+ -122.26593404251,
+ 38.097227380932
+ ],
+ [
+ -122.26851121549,
+ 38.097679090544
+ ],
+ [
+ -122.2648437001,
+ 38.096248676774
+ ],
+ [
+ -122.26692526289,
+ 38.096399246644
+ ],
+ [
+ -122.2587972558,
+ 38.090225881951
+ ],
+ [
+ -122.26097794063,
+ 38.089096607922
+ ],
+ [
+ -122.25810340154,
+ 38.089397747663
+ ],
+ [
+ -122.25978847618,
+ 38.087967333893
+ ],
+ [
+ -122.25731042524,
+ 38.08864489831
+ ],
+ [
+ -122.25899549988,
+ 38.08721448454
+ ],
+ [
+ -122.25651744894,
+ 38.087892048957
+ ],
+ [
+ -122.25820252358,
+ 38.086461635187
+ ],
+ [
+ -122.2556253506,
+ 38.087139199605
+ ],
+ [
+ -122.25582359467,
+ 38.085482931028
+ ],
+ [
+ -122.25384115392,
+ 38.084805366611
+ ],
+ [
+ -122.24710085536,
+ 38.075771174377
+ ],
+ [
+ -122.24829031981,
+ 38.0766745936
+ ],
+ [
+ -122.25126398094,
+ 38.072985631771
+ ],
+ [
+ -122.25126398094,
+ 38.069447239813
+ ],
+ [
+ -122.25304817762,
+ 38.069070815137
+ ],
+ [
+ -122.25146222502,
+ 38.069748379554
+ ],
+ [
+ -122.25294905558,
+ 38.072383352289
+ ],
+ [
+ -122.2556253506,
+ 38.072759776965
+ ],
+ [
+ -122.25830164561,
+ 38.06869439046
+ ],
+ [
+ -122.26979980198,
+ 38.067113406819
+ ],
+ [
+ -122.26841209345,
+ 38.070802368648
+ ],
+ [
+ -122.27118751051,
+ 38.0753947497
+ ],
+ [
+ -122.28000937185,
+ 38.080890549976
+ ],
+ [
+ -122.30141973198,
+ 38.105508723814
+ ]
+ ],
+ [
+ [
+ -122.69929559101,
+ 37.890344378775
+ ],
+ [
+ -122.70306222844,
+ 37.889892669163
+ ],
+ [
+ -122.7121814559,
+ 37.892377072028
+ ],
+ [
+ -122.71386653054,
+ 37.894635620086
+ ],
+ [
+ -122.73210498546,
+ 37.898926861397
+ ],
+ [
+ -122.74290928756,
+ 37.921286487176
+ ],
+ [
+ -122.74528821647,
+ 37.924072029782
+ ],
+ [
+ -122.75688549487,
+ 37.930471249281
+ ],
+ [
+ -122.76897838346,
+ 37.933482646692
+ ],
+ [
+ -122.77482658368,
+ 37.938827877097
+ ],
+ [
+ -122.78017917371,
+ 37.939053731903
+ ],
+ [
+ -122.78444142133,
+ 37.942667408797
+ ],
+ [
+ -122.78850542487,
+ 37.943043833473
+ ],
+ [
+ -122.79118171989,
+ 37.954562428571
+ ],
+ [
+ -122.79623694381,
+ 37.96480117977
+ ],
+ [
+ -122.80545529331,
+ 37.976244489933
+ ],
+ [
+ -122.81080788334,
+ 37.980234591503
+ ],
+ [
+ -122.81725081578,
+ 37.981815575144
+ ],
+ [
+ -122.82458584657,
+ 37.992204896213
+ ],
+ [
+ -122.83201999939,
+ 37.994312874401
+ ],
+ [
+ -122.83509278256,
+ 37.998754685582
+ ],
+ [
+ -122.84054449462,
+ 38.0019919378
+ ],
+ [
+ -122.85967504789,
+ 38.01268239861
+ ],
+ [
+ -122.87989594356,
+ 38.020512031879
+ ],
+ [
+ -122.90517206316,
+ 38.024426848514
+ ],
+ [
+ -122.92469910457,
+ 38.02480327319
+ ],
+ [
+ -122.92995257256,
+ 38.025857262284
+ ],
+ [
+ -122.93371920999,
+ 38.028868659696
+ ],
+ [
+ -122.95869796347,
+ 38.023598714226
+ ],
+ [
+ -122.97465661153,
+ 38.012531828739
+ ],
+ [
+ -122.9801083236,
+ 38.002594217282
+ ],
+ [
+ -122.97307065893,
+ 37.998227691035
+ ],
+ [
+ -122.96553738407,
+ 37.997625411553
+ ],
+ [
+ -122.96355494332,
+ 37.99544214843
+ ],
+ [
+ -122.960085672,
+ 37.990473342701
+ ],
+ [
+ -122.96226635683,
+ 37.986407956196
+ ],
+ [
+ -122.96424879758,
+ 37.985805676714
+ ],
+ [
+ -122.97356626912,
+ 37.98603153152
+ ],
+ [
+ -122.97753115062,
+ 37.98889235906
+ ],
+ [
+ -123.00469058893,
+ 37.989042928931
+ ],
+ [
+ -123.010142301,
+ 37.991301476989
+ ],
+ [
+ -123.01658523345,
+ 37.990247487895
+ ],
+ [
+ -123.02501060665,
+ 37.991301476989
+ ],
+ [
+ -123.028579,
+ 37.994614014142
+ ],
+ [
+ -123.02679480332,
+ 37.999959244547
+ ],
+ [
+ -123.02203694552,
+ 38.002669502217
+ ],
+ [
+ -123.0161887453,
+ 38.003572921441
+ ],
+ [
+ -123.00921069625,
+ 38.018021404017
+ ],
+ [
+ -122.99462924096,
+ 38.048213209999
+ ],
+ [
+ -122.9742860523,
+ 38.093301559952
+ ],
+ [
+ -122.96097777034,
+ 38.124932237116
+ ],
+ [
+ -122.9608786483,
+ 38.128997623622
+ ],
+ [
+ -122.95354361752,
+ 38.150679684983
+ ],
+ [
+ -122.95354361752,
+ 38.16046672657
+ ],
+ [
+ -122.95869796347,
+ 38.168898639322
+ ],
+ [
+ -122.95869796347,
+ 38.174469724533
+ ],
+ [
+ -122.96583475018,
+ 38.17770697675
+ ],
+ [
+ -122.97039436391,
+ 38.177932831556
+ ],
+ [
+ -122.97217856059,
+ 38.180718374161
+ ],
+ [
+ -122.97188119448,
+ 38.184106196249
+ ],
+ [
+ -122.96940314354,
+ 38.18711759366
+ ],
+ [
+ -122.97138558429,
+ 38.192538109
+ ],
+ [
+ -122.97059260799,
+ 38.198711473694
+ ],
+ [
+ -122.98437057122,
+ 38.212187477109
+ ],
+ [
+ -122.9861547679,
+ 38.220393535055
+ ],
+ [
+ -122.99150735793,
+ 38.224985916107
+ ],
+ [
+ -122.99844590056,
+ 38.227169179231
+ ],
+ [
+ -122.99943712094,
+ 38.230557001318
+ ],
+ [
+ -122.99785116834,
+ 38.233417828859
+ ],
+ [
+ -123.00023009724,
+ 38.240042903164
+ ],
+ [
+ -122.99824765649,
+ 38.243731864993
+ ],
+ [
+ -122.99567048351,
+ 38.245388133569
+ ],
+ [
+ -122.98556003567,
+ 38.24169917174
+ ],
+ [
+ -122.98238813047,
+ 38.238913629135
+ ],
+ [
+ -122.97802676081,
+ 38.240193473035
+ ],
+ [
+ -122.97198031652,
+ 38.230481716383
+ ],
+ [
+ -122.93542639084,
+ 38.200335948135
+ ],
+ [
+ -122.88118453005,
+ 38.126889645434
+ ],
+ [
+ -122.86225222086,
+ 38.112359652924
+ ],
+ [
+ -122.83281297569,
+ 38.132611300515
+ ],
+ [
+ -122.83479541644,
+ 38.135396843121
+ ],
+ [
+ -122.80763597813,
+ 38.141193783138
+ ],
+ [
+ -122.80763597813,
+ 38.139763369367
+ ],
+ [
+ -122.79633606584,
+ 38.132385445709
+ ],
+ [
+ -122.79197469619,
+ 38.135396843121
+ ],
+ [
+ -122.78900103506,
+ 38.132009021033
+ ],
+ [
+ -122.78533351967,
+ 38.132987725192
+ ],
+ [
+ -122.78166600428,
+ 38.12982575791
+ ],
+ [
+ -122.77918795333,
+ 38.124706382311
+ ],
+ [
+ -122.77641253628,
+ 38.123727678152
+ ],
+ [
+ -122.77611517017,
+ 38.120490425935
+ ],
+ [
+ -122.77205116663,
+ 38.121092705417
+ ],
+ [
+ -122.76620296641,
+ 38.126212081016
+ ],
+ [
+ -122.75966091192,
+ 38.121092705417
+ ],
+ [
+ -122.74033211459,
+ 38.128847053751
+ ],
+ [
+ -122.74023299255,
+ 38.130653892198
+ ],
+ [
+ -122.73626811104,
+ 38.132009021033
+ ],
+ [
+ -122.73567337882,
+ 38.135472128056
+ ],
+ [
+ -122.72496819875,
+ 38.14322647639
+ ],
+ [
+ -122.71911999853,
+ 38.144958029902
+ ],
+ [
+ -122.71099199145,
+ 38.138935235079
+ ],
+ [
+ -122.70960428292,
+ 38.135999122603
+ ],
+ [
+ -122.70563940142,
+ 38.142548911973
+ ],
+ [
+ -122.7021701301,
+ 38.14194663249
+ ],
+ [
+ -122.69661929599,
+ 38.142473627037
+ ],
+ [
+ -122.6921588043,
+ 38.14578616419
+ ],
+ [
+ -122.68323782091,
+ 38.149173986278
+ ],
+ [
+ -122.66688268471,
+ 38.148571706795
+ ],
+ [
+ -122.66113360652,
+ 38.145485024449
+ ],
+ [
+ -122.65280735536,
+ 38.148044712248
+ ],
+ [
+ -122.64160656511,
+ 38.146313158737
+ ],
+ [
+ -122.63030665282,
+ 38.150604400048
+ ],
+ [
+ -122.62584616113,
+ 38.149475126019
+ ],
+ [
+ -122.61712342182,
+ 38.150529115113
+ ],
+ [
+ -122.6197005948,
+ 38.152862948106
+ ],
+ [
+ -122.61920498461,
+ 38.155723775647
+ ],
+ [
+ -122.6236654763,
+ 38.159939732023
+ ],
+ [
+ -122.62584616113,
+ 38.165586102169
+ ],
+ [
+ -122.62307074408,
+ 38.169576203739
+ ],
+ [
+ -122.62624264928,
+ 38.171834751798
+ ],
+ [
+ -122.6228725,
+ 38.173340450503
+ ],
+ [
+ -122.61870937442,
+ 38.168898639322
+ ],
+ [
+ -122.61543834718,
+ 38.171232472315
+ ],
+ [
+ -122.60800419436,
+ 38.170103198286
+ ],
+ [
+ -122.604435801,
+ 38.168070505034
+ ],
+ [
+ -122.59700164818,
+ 38.167769365292
+ ],
+ [
+ -122.59511832946,
+ 38.169350348933
+ ],
+ [
+ -122.5936314989,
+ 38.168748069451
+ ],
+ [
+ -122.58927012925,
+ 38.173039310762
+ ],
+ [
+ -122.57350972526,
+ 38.16189714034
+ ],
+ [
+ -122.56766152504,
+ 38.164532113075
+ ],
+ [
+ -122.57172552859,
+ 38.173039310762
+ ],
+ [
+ -122.57053606413,
+ 38.174846149209
+ ],
+ [
+ -122.5736088473,
+ 38.176502417785
+ ],
+ [
+ -122.5796552916,
+ 38.185386040149
+ ],
+ [
+ -122.57816846103,
+ 38.183579201702
+ ],
+ [
+ -122.57073430821,
+ 38.183503916767
+ ],
+ [
+ -122.57321235915,
+ 38.186289459372
+ ],
+ [
+ -122.57073430821,
+ 38.18711759366
+ ],
+ [
+ -122.56528259614,
+ 38.182751067414
+ ],
+ [
+ -122.56845450134,
+ 38.177029412332
+ ],
+ [
+ -122.56448961984,
+ 38.175072004015
+ ],
+ [
+ -122.56320103335,
+ 38.169350348933
+ ],
+ [
+ -122.55923615184,
+ 38.168597499581
+ ],
+ [
+ -122.55428004996,
+ 38.170103198286
+ ],
+ [
+ -122.5520002431,
+ 38.168973924257
+ ],
+ [
+ -122.55794756536,
+ 38.163553408917
+ ],
+ [
+ -122.55794756536,
+ 38.160165586829
+ ],
+ [
+ -122.54962131419,
+ 38.157304759288
+ ],
+ [
+ -122.54446696824,
+ 38.158735173058
+ ],
+ [
+ -122.53485213059,
+ 38.149173986278
+ ],
+ [
+ -122.52107416736,
+ 38.141494922879
+ ],
+ [
+ -122.51403650269,
+ 38.13381585948
+ ],
+ [
+ -122.50689971598,
+ 38.116650894235
+ ],
+ [
+ -122.49996117334,
+ 38.111531518636
+ ],
+ [
+ -122.48400252529,
+ 38.107767271872
+ ],
+ [
+ -122.48261481676,
+ 38.09918478925
+ ],
+ [
+ -122.48083062008,
+ 38.091957435463
+ ],
+ [
+ -122.47983939971,
+ 38.06854382059
+ ],
+ [
+ -122.4874717966,
+ 38.04731346884
+ ],
+ [
+ -122.49361736294,
+ 38.027287676055
+ ],
+ [
+ -122.49292350867,
+ 38.02209301552
+ ],
+ [
+ -122.48539023381,
+ 38.017124209791
+ ],
+ [
+ -122.47874905729,
+ 38.011477839645
+ ],
+ [
+ -122.45951938199,
+ 38.006734888722
+ ],
+ [
+ -122.45783430735,
+ 38.002820072088
+ ],
+ [
+ -122.44643527303,
+ 37.993183600372
+ ],
+ [
+ -122.44276775763,
+ 37.984601117749
+ ],
+ [
+ -122.44782298155,
+ 37.979331172279
+ ],
+ [
+ -122.45634747679,
+ 37.975943350192
+ ],
+ [
+ -122.46844036538,
+ 37.979782881891
+ ],
+ [
+ -122.47072017225,
+ 37.977674903703
+ ],
+ [
+ -122.4711166604,
+ 37.973609517198
+ ],
+ [
+ -122.4618983109,
+ 37.966608018217
+ ],
+ [
+ -122.4618983109,
+ 37.963220196129
+ ],
+ [
+ -122.4642772398,
+ 37.9608110782
+ ],
+ [
+ -122.47101753836,
+ 37.960058228847
+ ],
+ [
+ -122.47874905729,
+ 37.965252889382
+ ],
+ [
+ -122.48449813548,
+ 37.965554029123
+ ],
+ [
+ -122.48578672196,
+ 37.958552530141
+ ],
+ [
+ -122.48400252529,
+ 37.952454450384
+ ],
+ [
+ -122.47299997911,
+ 37.948389063878
+ ],
+ [
+ -122.47151314855,
+ 37.944323677373
+ ],
+ [
+ -122.47230612485,
+ 37.941538134767
+ ],
+ [
+ -122.47696486062,
+ 37.938225597615
+ ],
+ [
+ -122.48400252529,
+ 37.935891764621
+ ],
+ [
+ -122.48816565087,
+ 37.932955652145
+ ],
+ [
+ -122.48717443049,
+ 37.924975449005
+ ],
+ [
+ -122.48202008453,
+ 37.922415761206
+ ],
+ [
+ -122.4711166604,
+ 37.920307783018
+ ],
+ [
+ -122.46992719594,
+ 37.913080429231
+ ],
+ [
+ -122.46516933814,
+ 37.902465253356
+ ],
+ [
+ -122.45723957513,
+ 37.898701006592
+ ],
+ [
+ -122.44762473748,
+ 37.898324581915
+ ],
+ [
+ -122.4350362387,
+ 37.885149718241
+ ],
+ [
+ -122.43473887259,
+ 37.876266095877
+ ],
+ [
+ -122.42215037381,
+ 37.87445925743
+ ],
+ [
+ -122.41868110249,
+ 37.852476056328
+ ],
+ [
+ -122.4242319366,
+ 37.850443363075
+ ],
+ [
+ -122.42968364867,
+ 37.851196212428
+ ],
+ [
+ -122.43573009296,
+ 37.849389373981
+ ],
+ [
+ -122.44385810005,
+ 37.852099631651
+ ],
+ [
+ -122.45198610713,
+ 37.861585533497
+ ],
+ [
+ -122.45872640569,
+ 37.857821286733
+ ],
+ [
+ -122.47161227058,
+ 37.863542941814
+ ],
+ [
+ -122.47409032152,
+ 37.860230404662
+ ],
+ [
+ -122.47458593171,
+ 37.849690513722
+ ],
+ [
+ -122.47141402651,
+ 37.842463159935
+ ],
+ [
+ -122.46754826704,
+ 37.838171918624
+ ],
+ [
+ -122.46754826704,
+ 37.83583808563
+ ],
+ [
+ -122.46804387723,
+ 37.833654822507
+ ],
+ [
+ -122.47220700281,
+ 37.832073838866
+ ],
+ [
+ -122.47418944356,
+ 37.833353682766
+ ],
+ [
+ -122.47805520303,
+ 37.832450263543
+ ],
+ [
+ -122.47964115563,
+ 37.830492855225
+ ],
+ [
+ -122.47835256914,
+ 37.828083737296
+ ],
+ [
+ -122.47914554544,
+ 37.825599334432
+ ],
+ [
+ -122.491139312,
+ 37.82642746872
+ ],
+ [
+ -122.49480682739,
+ 37.822738506891
+ ],
+ [
+ -122.49986205131,
+ 37.821835087668
+ ],
+ [
+ -122.49976292927,
+ 37.81972710948
+ ],
+ [
+ -122.50144800391,
+ 37.821684517797
+ ],
+ [
+ -122.50412429892,
+ 37.82100695338
+ ],
+ [
+ -122.50521464134,
+ 37.822889076762
+ ],
+ [
+ -122.51106284156,
+ 37.824470060403
+ ],
+ [
+ -122.5235522183,
+ 37.824695915209
+ ],
+ [
+ -122.52920217444,
+ 37.819049545062
+ ],
+ [
+ -122.52741797777,
+ 37.814984158557
+ ],
+ [
+ -122.53405915429,
+ 37.815360583233
+ ],
+ [
+ -122.53960998839,
+ 37.821458662991
+ ],
+ [
+ -122.54020472062,
+ 37.826954463267
+ ],
+ [
+ -122.55269409736,
+ 37.831471559384
+ ],
+ [
+ -122.55338795162,
+ 37.835386376019
+ ],
+ [
+ -122.56389488761,
+ 37.843592433965
+ ],
+ [
+ -122.56706679282,
+ 37.849464658917
+ ],
+ [
+ -122.57073430821,
+ 37.849464658917
+ ],
+ [
+ -122.57806933899,
+ 37.854508749581
+ ],
+ [
+ -122.58411578329,
+ 37.853379475551
+ ],
+ [
+ -122.5920455463,
+ 37.85834828128
+ ],
+ [
+ -122.60136301784,
+ 37.869716306508
+ ],
+ [
+ -122.61117609956,
+ 37.873480553272
+ ],
+ [
+ -122.61900674053,
+ 37.872953558725
+ ],
+ [
+ -122.62475581871,
+ 37.876341380813
+ ],
+ [
+ -122.62842333411,
+ 37.876491950683
+ ],
+ [
+ -122.64626530088,
+ 37.894560335151
+ ],
+ [
+ -122.66718005082,
+ 37.901561834132
+ ],
+ [
+ -122.68006591571,
+ 37.902314683485
+ ],
+ [
+ -122.69473597728,
+ 37.895990748921
+ ],
+ [
+ -122.69929559101,
+ 37.890344378775
+ ]
+ ]
+ ],
+ "bbox": [
+ -123.028579,
+ 37.057166,
+ -121.405753,
+ 38.313521
+ ]
+}
\ No newline at end of file
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts
index 7f8af08..d68ef2b 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts
@@ -75,6 +75,15 @@
};
fs = new FnService(ar, logSpy, windowMock);
+ const bundleObj = {
+ 'core.view.Topo': {
+ test: 'test1'
+ }
+ };
+ const mockLion = (key) => {
+ return bundleObj[key] || '%' + key + '%';
+ };
+
TestBed.configureTestingModule({
declarations: [ NoDeviceConnectedSvgComponent ],
providers: [
@@ -83,6 +92,15 @@
{ provide: SvgUtilService, useClass: MockSvgUtilService },
{ provide: WebSocketService, useClass: MockWebSocketService },
{ provide: PrefsService, useClass: MockPrefsService },
+ {
+ provide: LionService, useFactory: (() => {
+ return {
+ bundle: ((bundleId) => mockLion),
+ ubercache: new Array(),
+ loadCbs: new Map<string, () => void>([])
+ };
+ })
+ },
{ provide: 'Window', useValue: windowMock },
]
}).compileComponents();
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
index bc3fd76..76dc2a4 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
@@ -167,7 +167,7 @@
return bundleObj[key] || '%' + key + '%';
};
- beforeEach(async(() => {
+ beforeEach(() => {
const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
ar = new MockActivatedRoute({ 'debug': 'txrx' });
@@ -235,7 +235,7 @@
]
}).compileComponents();
logServiceSpy = TestBed.get(LogService);
- }));
+ });
beforeEach(() => {
fixture = TestBed.createComponent(TopologyComponent);
diff --git a/web/gui2/package-lock.json b/web/gui2/package-lock.json
index 0617b40..c2f62fa 100644
--- a/web/gui2/package-lock.json
+++ b/web/gui2/package-lock.json
@@ -364,7 +364,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -2567,7 +2567,7 @@
"anymatch": "2.0.0",
"async-each": "1.0.1",
"braces": "2.3.2",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "3.1.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -4704,8 +4704,8 @@
}
},
"fm-gui2-lib": {
- "version": "file:../../apps/faultmanagement/fm-gui2-lib/dist/fm-gui2-lib/fm-gui2-lib-2.1.0.tgz",
- "integrity": "sha512-SFJjGnpWJRx4CRsUiGq1us6rFIfSN20M5JDQ7sn2T1SAEX3tVo+IcN52gwF/27Wdqwnz3LiP4fAKpRrCw71ctA==",
+ "version": "file:../../apps/faultmanagement/fm-gui2-lib/fm-gui2-lib-2.1.0.tgz",
+ "integrity": "sha512-DQ9kWJAwVAWPyN8KEKU9xKBAlr+loYGG0Ce+UxZ8GS4XJJlkRI7JlX87TljTCtfD/Z32kBTDBCMwptQBSFWo3g==",
"requires": {
"tslib": "1.9.3"
}
@@ -4838,14 +4838,14 @@
"dev": true
},
"fsevents": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
- "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+ "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
"dev": true,
"optional": true,
"requires": {
- "nan": "2.11.1",
- "node-pre-gyp": "0.10.3"
+ "nan": "2.14.0",
+ "node-pre-gyp": "0.12.0"
},
"dependencies": {
"abbrev": {
@@ -4917,12 +4917,12 @@
"optional": true
},
"debug": {
- "version": "2.6.9",
+ "version": "4.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "ms": "2.0.0"
+ "ms": "2.1.1"
}
},
"deep-extend": {
@@ -5087,37 +5087,44 @@
}
},
"ms": {
- "version": "2.0.0",
+ "version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
},
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "dev": true,
+ "optional": true
+ },
"needle": {
- "version": "2.2.4",
+ "version": "2.3.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
+ "debug": "4.1.1",
"iconv-lite": "0.4.24",
"sax": "1.2.4"
}
},
"node-pre-gyp": {
- "version": "0.10.3",
+ "version": "0.12.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
- "needle": "2.2.4",
+ "needle": "2.3.0",
"nopt": "4.0.1",
- "npm-packlist": "1.2.0",
+ "npm-packlist": "1.4.1",
"npmlog": "4.1.2",
"rc": "1.2.8",
"rimraf": "2.6.3",
- "semver": "5.6.0",
+ "semver": "5.7.0",
"tar": "4.4.8"
}
},
@@ -5132,19 +5139,19 @@
}
},
"npm-bundled": {
- "version": "1.0.5",
+ "version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true
},
"npm-packlist": {
- "version": "1.2.0",
+ "version": "1.4.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ignore-walk": "3.0.1",
- "npm-bundled": "1.0.5"
+ "npm-bundled": "1.0.6"
}
},
"npmlog": {
@@ -5274,7 +5281,7 @@
"optional": true
},
"semver": {
- "version": "5.6.0",
+ "version": "5.7.0",
"bundled": true,
"dev": true,
"optional": true
@@ -5559,15 +5566,15 @@
"dev": true
},
"gui2-fw-lib": {
- "version": "file:../gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.0.tgz",
- "integrity": "sha512-UF/S6N4eNo3lrIRE9B/5WrGvq84tyfeClW3TKj2ftbTXpoNSiNcjLWYHiueR8dqPhh68AeEx97iVXkg9hU7BkQ==",
+ "version": "file:../gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "integrity": "sha512-667z5UF7smRugLD3muYVzs4jXPCZ8JBAde8YTwixoS1btVs6YzGPu4NXMUxdxJn/JbpRf6YXcnfRTgPmSQRX9w==",
"requires": {
"tslib": "1.9.3"
}
},
"gui2-topo-lib": {
- "version": "file:../gui2-topo-lib/dist/gui2-topo-lib/gui2-topo-lib-2.1.0.tgz",
- "integrity": "sha512-aONaJ4A782rILG/0mk9xKx6UBREUF8NHedZNo3ZRssrfcuGbdX5aDldnXtn8J7Tjd8Dxg1e9R7eMuHqRUJ1xvg==",
+ "version": "file:../gui2-topo-lib/gui2-topo-lib-2.1.1.tgz",
+ "integrity": "sha512-bBJbyqHihSYaJRp9Ng1gN/H/SLBMpB8xLyj30MBDlj0m57Zobi99sboeTUv4dgevLNVDOCdpLTONZJNpa2wFnQ==",
"requires": {
"tslib": "1.9.3"
}
@@ -7126,7 +7133,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -7471,7 +7478,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.2.7",
+ "fsevents": "1.2.9",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
diff --git a/web/gui2/package.json b/web/gui2/package.json
index 3958008..d5f143d 100644
--- a/web/gui2/package.json
+++ b/web/gui2/package.json
@@ -24,9 +24,9 @@
"@angular/router": "^7.0.2",
"core-js": "^2.5.4",
"d3": "^5.2.0",
- "fm-gui2-lib": "file:../../apps/faultmanagement/fm-gui2-lib/dist/fm-gui2-lib/fm-gui2-lib-2.1.0.tgz",
- "gui2-fw-lib": "file:../gui2-fw-lib/dist/gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
- "gui2-topo-lib": "file:../gui2-topo-lib/dist/gui2-topo-lib/gui2-topo-lib-2.1.1.tgz",
+ "fm-gui2-lib": "file:../../apps/faultmanagement/fm-gui2-lib/fm-gui2-lib-2.1.0.tgz",
+ "gui2-fw-lib": "file:../gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
+ "gui2-topo-lib": "file:../gui2-topo-lib/gui2-topo-lib-2.1.1.tgz",
"rxjs": "^6.0.0",
"topojson-client": "^3.0.0",
"zone.js": "^0.8.26"