UG dev setup

helitopia · Aug 27, 2024 · 3e58c68 · 3e58c68
1 parent 46756d6
commit 3e58c68
Show file tree

Hide file tree

Showing 35 changed files with 31 additions and 967 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "autoprefixer": "^10.4.19",
     "babel-loader": "^8.3.0",
     "glob": "^10.4.1",
-    "node-sass": "^7.0.3",
     "postcss": "^8.4.38",
     "rollup": "^2.79.1",
     "rollup-plugin-scss": "^3.0.0",

diff --git a/packages/jsvectormap/build/package.js b/packages/jsvectormap/build/package.js
@@ -16,20 +16,6 @@ function scssOptions(filename, outputStyle = 'expanded') {
   }
 }
 
-function getCommonMaps() {
-  return ['world-merc', 'world'].map((file) => ({
-    external: ['jsvectormap'],
-    input: `../maps/src/${file}.js`,
-    output: {
-      file: `dist/maps/${file}.js`,
-      format: 'cjs',
-      plugins: [terser()],
-      globals: { jsvectormap: LIBRARY_NAME },
-    },
-    plugins: [resolve()],
-  }))
-}
-
 const builds = ['umd', 'es', 'cjs'].map((format) => {
   const extension = format === 'umd'
     ? 'js'
@@ -67,6 +53,5 @@ export default [
       scss(scssOptions('jsvectormap.min', 'compressed')),
     ],
   },
-  ...builds,
-  ...getCommonMaps(),
+  ...builds
 ]
diff --git a/packages/jsvectormap/package.json b/packages/jsvectormap/package.json
@@ -12,7 +12,7 @@
       "style": "./dist/jsvectormap.css",
       "sass": "./src/scss/jsvectormap.scss"
     },
-    "./*": "./*"
+    "./*": "./dist/*"
   },
   "style": "dist/jsvectormap.min.css",
   "sass": "src/scss/jsvectormap.scss",

diff --git a/packages/jsvectormap/rollup.config.js b/packages/jsvectormap/rollup.config.js
@@ -8,7 +8,7 @@ export default {
   input: 'src/js/index.js',
   output: {
     name: 'jsVectorMap',
-    file: 'dist/jsvectormap.js',
+    file: 'dist/jsvectormap.esm.js',
     format: 'es',
   },
   plugins: [

diff --git a/packages/jsvectormap/src/js/core/createRegions.js b/packages/jsvectormap/src/js/core/createRegions.js
@@ -1,14 +1,15 @@
 import { merge } from '../util'
 import Region from '../components/region'
 
-export default function createRegions() {
+export default function createRegions(strokeScaling) {
   this._regionLabelsGroup = this._regionLabelsGroup || this.canvas.createGroup('jvm-regions-labels-group')
 
   for (const code in this._mapData.paths) {
     const region = new Region({
       map: this,
       code: code,
       path: this._mapData.paths[code].path,
+      strokeScaling,
       style: merge({}, this.params.regionStyle),
       labelStyle: this.params.regionLabelStyle, 
       labelsGroup: this._regionLabelsGroup,

diff --git a/packages/maps/src/_ug-world.js b/packages/maps/src/_ug-world.js
diff --git a/packages/maps/src/canada.js b/packages/maps/src/canada.js
diff --git a/packages/maps/src/iraq.js b/packages/maps/src/iraq.js
diff --git a/packages/maps/src/italy.js b/packages/maps/src/italy.js
diff --git a/packages/maps/src/russia.js b/packages/maps/src/russia.js
diff --git a/packages/maps/src/spain.js b/packages/maps/src/spain.js
diff --git a/packages/maps/src/us-aea-en.js b/packages/maps/src/us-aea-en.js
diff --git a/packages/maps/src/us-lcc-en.js b/packages/maps/src/us-lcc-en.js
diff --git a/packages/maps/src/us-merc-en.js b/packages/maps/src/us-merc-en.js
diff --git a/packages/maps/src/us-mill-en.js b/packages/maps/src/us-mill-en.js
diff --git a/packages/maps/src/world-merc.js b/packages/maps/src/world-merc.js
diff --git a/packages/maps/src/world.js b/packages/maps/src/world.js
diff --git a/packages/playground/assets/css/style.css b/packages/playground/assets/css/style.css
@@ -28,7 +28,7 @@ body {
   font-size: .925rem;
 }
 
-.workspace-wrapper #map {
+.workspace-wrapper .value--map {
   width: 800px;
   height: 475px;
   margin: 2rem auto 0;

diff --git a/packages/playground/assets/images/marker.png b/packages/playground/assets/images/marker.png
diff --git a/packages/playground/assets/images/marker2.png b/packages/playground/assets/images/marker2.png
diff --git a/packages/playground/assets/images/marker3.png b/packages/playground/assets/images/marker3.png
diff --git a/packages/playground/assets/images/pin.png b/packages/playground/assets/images/pin.png
diff --git a/packages/playground/assets/images/pingreen.png b/packages/playground/assets/images/pingreen.png
diff --git a/packages/playground/index.html b/packages/playground/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" href="/assets/css/style.css" />
     <title>jsvectormap (Workspace)</title>
@@ -16,7 +15,7 @@ <h1>jsvectormap workspace.</h1>
         </div>
         <a href="#">Github Repository</a>
       </header>
-      <div id="map"></div>
+      <div class="value--map"></div>
     </div>
     <script type="module" src="/main.js"></script>
   </body>

diff --git a/packages/playground/main.js b/packages/playground/main.js
@@ -1,65 +1,24 @@
-import jsVectorMap from 'jsvectormap'
-import 'jsvectormap/dist/maps/world-merc'
-import 'jsvectormap/dist/jsvectormap.css'
-
-const markers = [
-  { name: 'Russia', coords: [61, 105] },
-  { name: 'Geenland', coords: [72, -42] },
-  { name: 'Canada', coords: [56.1304, -106.3468] },
-  { name: 'Palestine', coords: [31.5, 34.8] },
-  { name: 'Brazil', coords: [-14.2350, -51.9253] },
-]
-
-const map = new jsVectorMap({
-  map: 'world_merc',
-  selector: document.querySelector('#map'),
-  zoomButtons: false,
-
-  regionsSelectable: true,
-  markersSelectable: true,
-  markersSelectableOne: true,
-
-  regionStyle: {
-    initial: { fill: '#d1d5db' }
-  },
-
-  // Labels
-  labels: {
-    markers: {
-      render: function(marker) {
-        return marker.name
-      },
+import JsVectorMap from 'jsvectormap'
+import 'jsvectormap/jsvectormap.css'
+import 'jsvectormap-maps/_ug-world.js'
+
+let map = new JsVectorMap({
+    selector: document.querySelector('.value--map'),
+    map: "ug-world",
+    zoomButtons: false,
+    zoomMax: 1000,
+    backgroundColor: "#b3dff5",
+    regionsSelectable: true,
+    regionsSelectableOne: true,
+    showTooltip: false,
+    regionStyle: {
+        initial: {
+            fill: "#fdfbe5",
+            stroke: "#757674",
+            strokeWidth: 1
+        },
+        selected: {
+            fill: "#e7f3ea"
+        }
     },
-  },
-
-  // Marker and label style
-  markers: markers,
-  markerStyle: { initial: { fill: '#66F' } },
-
-  // Event handling
-  onLoaded: function(map) {
-    console.log(map)
-  },
-  onViewportChange: function(x, y, z) {
-    console.log(x, y, z)
-  },
-  onRegionSelected: function (index, isSelected, selectedRegions) {
-    console.log(index, isSelected, selectedRegions)
-  },
-  onRegionTooltipShow: function (event, tooltip, index) {
-    console.log(tooltip, index)
-    console.log(tooltip)
-
-    tooltip.css({ backgroundColor: 'white', color: '#35373e' }).text(
-      tooltip.text() + ' (Hello World `region`)'
-    )
-  },
-  onMarkerSelected: function (code, isSelected, selectedMarkers) {
-    console.log(code, isSelected, selectedMarkers)
-  },
-  onMarkerTooltipShow: function (event, tooltip, code) {
-    tooltip.text(
-      tooltip.text() + ' (Hello World (marker))'
-    )
-  },
 })
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -15,7 +15,7 @@
     "vite": "^5.2.0"
   },
   "dependencies": {
-    "jsvectormap": "workspace:*",
+    "jsvectormap": "*",
     "jsvectormap-maps": "*"
   }
 }
diff --git a/packages/playground/samples/addmarkers.html b/packages/playground/samples/addmarkers.html