Feature/planning demo (#142)

* Planning demo data added
* Search fixes
* Docusuarus folder structure amends

Author: dannyleech

.github/workflows/deploy-docs.yml

@@ -7,7 +7,7 @@ on:
     paths:
       - 'docs/**'
       - 'src/**'
-      - 'static/**'
+      - 'assets/**'
       - 'docusaurus.config.cjs'
       - 'sidebars.cjs'
       - 'package.json'

static/img/.gitkeep assets/images/.gitkeepstatic/img/.gitkeep renamed to assets/images/.gitkeep

@@ -48,11 +48,11 @@ function MapInner ({ mapStyles }) {
     initialised.current = true
 
     Promise.all([
-      import('../index.js'),
-      import('../../providers/maplibre/src/index.js'),
-      import('../../plugins/search/src/index.js'),
-      import('../../plugins/beta/scale-bar/src/index.js'),
-      import('../../plugins/beta/map-styles/src/index.js')
+      import('../src/index.js'),
+      import('../providers/maplibre/src/index.js'),
+      import('../plugins/search/src/index.js'),
+      import('../plugins/beta/scale-bar/src/index.js'),
+      import('../plugins/beta/map-styles/src/index.js')
     ]).then(([
       { default: InteractiveMap },
       { default: maplibreProvider },
@@ -107,7 +107,7 @@ function MapInner ({ mapStyles }) {
 }
 
 export default function DemoMapButton () {
-  const thumbnailUrl = useBaseUrl('/img/outdoor-map-thumb.jpg')
+  const thumbnailUrl = useBaseUrl('/images/outdoor-map-thumb.jpg')
   const mapStyles = buildMapStyles(thumbnailUrl)
 
   return (

src/components/DemoMapButton.js demo/DemoMapButton.jssrc/components/DemoMapButton.js renamed to demo/DemoMapButton.js

@@ -48,11 +48,11 @@ function MapInner ({ mapStyles }) {
     initialised.current = true
 
     Promise.all([
-      import('../index.js'),
-      import('../../providers/maplibre/src/index.js'),
-      import('../../plugins/search/src/index.js'),
-      import('../../plugins/beta/scale-bar/src/index.js'),
-      import('../../plugins/beta/map-styles/src/index.js')
+      import('../src/index.js'),
+      import('../providers/maplibre/src/index.js'),
+      import('../plugins/search/src/index.js'),
+      import('../plugins/beta/scale-bar/src/index.js'),
+      import('../plugins/beta/map-styles/src/index.js')
     ]).then(([
       { default: InteractiveMap },
       { default: maplibreProvider },
@@ -123,7 +123,7 @@ function MapInner ({ mapStyles }) {
 }
 
 export default function DemoMapInline () {
-  const thumbnailUrl = useBaseUrl('/img/outdoor-map-thumb.jpg')
+  const thumbnailUrl = useBaseUrl('/images/outdoor-map-thumb.jpg')
   const mapStyles = buildMapStyles(thumbnailUrl)
 
   return (

src/components/DemoMapInline.js demo/DemoMapInline.jssrc/components/DemoMapInline.js renamed to demo/DemoMapInline.js

@@ -1,6 +1,6 @@
 import InteractiveMap from '../../src/index.js'
 import { openMapStyles, vtsMapStyles3857 } from './mapStyles.js'
-import { searchCustomDatasets } from './searchCustomDatasets.js'
+import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformTileRequest, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
@@ -137,7 +137,7 @@ var interactiveMap = new InteractiveMap('map', {
 		searchPlugin({
 			transformRequest: transformGeocodeRequest,
 			osNamesURL: process.env.OS_NAMES_URL,
-			customDatasets: searchCustomDatasets,
+			customDatasets: [parcelSearch, gridRefSearchETRS89],
 			width: '300px',
 			showMarker: false,
 			// manifest: { controls: [{ id: 'search',

demo/js/farming.js

@@ -1,6 +1,6 @@
 import InteractiveMap from '../../src/index.js'
 import { vtsMapStyles3857 } from './mapStyles.js'
-import { searchCustomDatasets } from './searchCustomDatasets.js'
+import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformTileRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
@@ -66,7 +66,7 @@ var interactiveMap = new InteractiveMap('map', {
 		searchPlugin({
 			transformRequest: transformGeocodeRequest,
 			osNamesURL: process.env.OS_NAMES_URL,
-			customDatasets: searchCustomDatasets,
+			customDatasets: [parcelSearch, gridRefSearchETRS89],
 			width: '300px',
 			showMarker: false,
 			// isExpanded: true

demo/js/forms.js

@@ -10,7 +10,7 @@
 // InteractiveMap
 import InteractiveMap from '../../src/index.js'
 import { openMapStyles, vtsMapStyles3857 } from './mapStyles.js'
-import { searchCustomDatasets } from './searchCustomDatasets.js'
+import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformTileRequest, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
@@ -151,7 +151,7 @@ const interactiveMap = new InteractiveMap('map', {
 		searchPlugin({
 			transformRequest: transformGeocodeRequest,
 			osNamesURL: process.env.OS_NAMES_URL,
-			customDatasets: searchCustomDatasets,
+			customDatasets: [parcelSearch, gridRefSearchETRS89],
 			width: '300px',
 			showMarker: false,
 			// isExpanded: true
@@ -172,7 +172,6 @@ interactiveMap.on('map:ready', function (e) {
 	// framePlugin.addFrame('test', {
 	// 	aspectRatio: 1
 	// })
-	console.log(e)
 	interactPlugin.enable()
 	interactiveMap.addButton('geometryActions', {
 		label: 'Draw tools',
@@ -199,7 +198,8 @@ interactiveMap.on('map:ready', function (e) {
 			onClick: function (e) {
 				interactiveMap.toggleButtonState('geometryActions', 'hidden', true)
 				drawPlugin.newLine(crypto.randomUUID(), {
-					stroke: { outdoor: '#99704a', dark: '#ffffff' }
+					stroke: { outdoor: '#99704a', dark: '#ffffff' },
+					strokeWidth: 6
 				})
 			}
 		},{