@woosmap/ui 4.164.3 → 4.164.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/ui",
-  "version": "4.164.3",
+  "version": "4.164.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WebGeoServices/ui.git"

package/src/components/PricingSlider/PricingData.js

@@ -5,7 +5,7 @@ import distanceImgSq from '../../images/products/product-distance-sq.png';
 import mapImgSq from '../../images/products/product-map-sq.png';
 import indoorImgSq from '../../images/products/product-indoor-sq.png';
 // import geofencingImgSq from '../../images/products/product-geofencing-sq.png';
-import transitImgSq from '../../images/products/product-transit-sq.png';
+// import transitImgSq from '../../images/products/product-transit-sq.png';
 
 /* eslint-disable */
 
@@ -20,7 +20,7 @@ const Pricing = {
                 publicTierCount: 2,
                 unit: "Monthly Requests",
                 description:
-                    "Search for your points of interest by location, proxilmity to a route, by their characteristics with autocomplete capabilities.",
+                    "Search for your points of interest by location, proxilmity to a route, by their characteristics with autocomplete capabilities",
                 pricing: [
                     [100000, 0.52],
                     [500000, 0.41],
@@ -54,7 +54,7 @@ const Pricing = {
                 publicTierCount: 2,
                 unit: "Monthly Requests",
                 description:
-                    "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book",
+                    "Handle and maintain location data, ensuring accuracy and reliability",
                 pricing: [
                     [100000, 10.32],
                     [500000, 8.24],
@@ -95,9 +95,7 @@ const Pricing = {
                 unit: "Monthly Requests",
                 description:
                     "Get suggestions on addresses, localities, postcodes and more. Search on full words as well as substrings, with high flexibility on typos",
-                pricing: [
-                    [50000000, 0],
-                ],
+                pricing: [],
                 discountEligible: true,
             },
             'Details': {
@@ -119,7 +117,7 @@ const Pricing = {
             },
             'Details UK Addresses': {
                 defaultQueries: 0,
-                publicTierCount: 2, unit: "Monthly Requests",
+                publicTierCount: 4, unit: "Monthly Requests",
                 description:
                     "Get details on Autocomplete suggestions on UK addresses benefiting from best available data on the market",
                 pricing: [
@@ -154,7 +152,7 @@ const Pricing = {
             },
             'Geocode/Reverse Geocode UK addresses': {
                 defaultQueries: 0,
-                publicTierCount: 2, unit: "Monthly Requests",
+                publicTierCount: 4, unit: "Monthly Requests",
                 description:
                     "Geocoding/Reverse geocoding on localities, postcodes and UK addresses benefiting from best available data on the market",
                 pricing: [
@@ -200,11 +198,11 @@ const Pricing = {
             },
         },
     },
-    'Map-Js': {
+    'Map': {
         image : mapImgSq,
         description : "Display your data without compromising readability",
         pricings: {
-            'Map': {
+            'Mapload': {
                 defaultQueries: 0,
                 publicTierCount: 2,
                 unit: "Monthly Requests",
@@ -346,6 +344,23 @@ const Pricing = {
                 ],
                 discountEligible: false,
             },
+            'Transit': {
+                defaultQueries: 0,
+                publicTierCount: 2,
+                unit: "Monthly Requests", 
+                description:
+                    "Get distance, duration, path and public transport details between an origin and a destination, based on public transportation",
+                pricing: [
+                    [100000, 3.68],
+                    [500000, 2.94],
+                    [1000000, 2.76],
+                    [5000000, 1.38],
+                    [10000000, 0.35],
+                    [20000000, 0.11],
+                    [50000000, 0.04],
+                ],
+                discountEligible: false,
+            },
         },
     },
     Geolocation: {
@@ -405,29 +420,6 @@ const Pricing = {
             },
         },
     },
-    'Transit': {
-        image : transitImgSq,
-        description : "Get time and path for travels using public transportation",
-        pricings: {
-            'Map': {
-                defaultQueries: 0,
-                publicTierCount: 2,
-                unit: "Monthly Requests",
-                description:
-                    "Get distance, duration, path and public transport details between an origin and a destination, based on public transportation",
-                pricing: [
-                    [100000, 2.58],
-                    [500000, 2.06],
-                    [1000000, 1.93],
-                    [5000000, 0.97],
-                    [10000000, 0.24],
-                    [20000000, 0.07],
-                    [50000000, 0.03],
-                ],
-                discountEligible: false,
-            },
-        },
-    },
     Indoor: {
         image : indoorImgSq,
         description : "Map private venues and propose indoor search and wayfinding",

package/src/components/PricingSlider/PricingSimulator.js

@@ -13,7 +13,7 @@ class PricingSimulator extends Component {
                     sliders[category] = {};
                 }
                 sliders[category][pricingKey] = {
-                    queries: PricingData[category].pricings[pricingKey].defaultQueries || 0,
+                    queries: 0,
                     amount: 0,
                     computedQueries: PricingData[category].pricings[pricingKey].defaultQueries || 0,
                 };
@@ -112,6 +112,7 @@ class PricingSimulator extends Component {
                                 const productPricing = PricingData[category].pricings[pricingKey];
                                 return (
                                     <PricingSlider
+                                        id={this.getAnchor(`${category}_${pricingKey}`)}
                                         productPricing={productPricing}
                                         name={pricingKey}
                                         key={`pricing_${pricingKey.replace(' ', '')}`}

package/src/components/PricingSlider/PricingSlider.js

@@ -35,13 +35,17 @@ class PricingSlider extends Component {
     computeQueries = (valueNow) => {
         const { productPricing, publicMode } = this.props;
         const { pricing, publicTierCount } = productPricing;
-        const tierIndex = Math.min(Math.floor(valueNow / 1000), pricing.length - 1);
+        if (pricing.length === 0) {
+            return valueNow;
+        }
+        const tierIndex = Math.min(Math.floor(valueNow / 100000), pricing.length - 1);
+
         // eslint-disable-next-line prefer-destructuring
         const tier = pricing[tierIndex][0];
-        const value = valueNow - tierIndex * 1000;
+        const value = valueNow - tierIndex * 100000;
 
         const previousTier = pricing[tierIndex - 1] ? pricing[tierIndex - 1][0] : 0;
-        const newValue = ((tier - previousTier) * value) / 1000 + previousTier;
+        const newValue = ((tier - previousTier) * value) / 100000 + previousTier;
         if (newValue > pricing[publicMode ? publicTierCount - 1 : pricing.length - 1][0]) {
             return '∞';
         }
@@ -58,7 +62,7 @@ class PricingSlider extends Component {
         const tier = pricing[matchedTierIndex];
         if (tier) {
             const previousTier = matchedTierIndex > 0 ? pricing[matchedTierIndex - 1][0] : 0;
-            const queries = matchedTierIndex * 1000 + (1000 * (value - previousTier)) / tier[0];
+            const queries = matchedTierIndex * 100000 + (100000 * (value - previousTier)) / tier[0];
             this.onChange(queries);
         }
     };
@@ -80,11 +84,11 @@ class PricingSlider extends Component {
         if (props.key === 0) {
             value = 0;
         } else {
-            const index = props.key / 1000 - 1;
+            const index = props.key / 100000 - 1;
             if (index === displayedPricing.length - 1 && publicMode) {
                 value = '∞';
             } else {
-                const tier = displayedPricing[props.key / 1000 - 1];
+                const tier = displayedPricing[props.key / 100000 - 1];
                 value = numeral(tier[0]).format('0.[0]a');
             }
         }
@@ -96,7 +100,7 @@ class PricingSlider extends Component {
         );
     };
 
-    getMarks = (displayedPricing) => [-1, ...displayedPricing.keys()].map((key) => (key + 1) * 1000);
+    getMarks = (displayedPricing) => [-1, ...displayedPricing.keys()].map((key) => (key + 1) * 100000);
 
     getDisplayedPricing = () => {
         const { productPricing, publicMode } = this.props;
@@ -132,7 +136,7 @@ class PricingSlider extends Component {
     };
 
     render() {
-        const { name, productPricing, currency, values } = this.props;
+        const { name, productPricing, currency, values, id } = this.props;
         const { queries } = values;
         const { displayedPricing, amount, formatedQueries, marks, computedQueries } = this.getDisplayedData(queries);
         let displayedAmount = <span className="amount">{`0${currency}`}</span>;
@@ -140,11 +144,11 @@ class PricingSlider extends Component {
             displayedAmount = this.contactSalesButton();
         } else if (amount > 0) {
             displayedAmount = <span className="amount">{`${parseInt(amount, 10)}${currency}`}</span>;
-        } else if (amount === 0 && computedQueries > 0) {
+        } else if (displayedPricing.length === 0) {
             displayedAmount = <span className="free-label">FREE</span>;
         }
         return (
-            <div className="pricing-slider__wrapper" id={name}>
+            <div className="pricing-slider__wrapper" id={id}>
                 <div className="pricing-slider__info">
                     <h3>{name}</h3>
                     <p>{productPricing.description}</p>
@@ -170,7 +174,7 @@ class PricingSlider extends Component {
                     onChange={(_queries) => {
                         this.onChange(_queries);
                     }}
-                    max={displayedPricing.length * 1000}
+                    max={displayedPricing.length * 100000 || 50000000}
                 />
                 <div className="pricing-slider__queries">
                     <div className="pricing-slider__queries__label">{productPricing.unit}</div>
@@ -192,6 +196,7 @@ PricingSlider.propTypes = {
     defaultQueries: PropTypes.number,
     onChange: PropTypes.func,
     values: PropTypes.object.isRequired,
+    id: PropTypes.string.isRequired,
 };
 
 export default PricingSlider;