|
@@ -27,7 +28,7 @@
|
- {{score.value != undefined ? (score.value|number:'1.2-2') : 'N/A'}}
+ {{score.value != undefined ? (score.value|number:PROPERTY_VIS_DEF[score.type].decimals) : 'N/A'}}
|
diff --git a/frontend/src/app/components/result/result.component.scss b/frontend/src/app/components/result/result.component.scss
index 274b8f9..9ac7870 100644
--- a/frontend/src/app/components/result/result.component.scss
+++ b/frontend/src/app/components/result/result.component.scss
@@ -67,6 +67,17 @@
.undefined {
color: #8f8f8f;
}
+
+ .result-desc {
+ text-transform: uppercase;
+ font-size: small;
+ margin-right: 0.25rem;
+ margin-bottom: 0.5rem;
+ overflow-y: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
}
}
diff --git a/frontend/src/app/components/search-input/search-input.component.html b/frontend/src/app/components/search-input/search-input.component.html
index 34810a1..957e1fa 100644
--- a/frontend/src/app/components/search-input/search-input.component.html
+++ b/frontend/src/app/components/search-input/search-input.component.html
@@ -10,7 +10,7 @@
- When is your trip?
+ When do you want to travel?
Start
@@ -24,7 +24,7 @@
- Which climate would you prefer?
+ Which climate makes you feel comfortable?
{{key|translate}}:
@@ -89,14 +89,17 @@
- Climate
-
+ Climate
+ Choose your sweetspot
+
- Fincancial
+ Fincancial
+ Choose your sweetspot
diff --git a/frontend/src/app/components/search-input/search-input.component.scss b/frontend/src/app/components/search-input/search-input.component.scss
index 80dec6a..61222d2 100644
--- a/frontend/src/app/components/search-input/search-input.component.scss
+++ b/frontend/src/app/components/search-input/search-input.component.scss
@@ -83,3 +83,10 @@
}
}
+.desc {
+ font-size: smaller;
+}
+
+.small-bottom-margin {
+ margin-bottom: 0.4rem !important;
+}
diff --git a/frontend/src/app/containers/region-details/region-details.component.html b/frontend/src/app/containers/region-details/region-details.component.html
index c8f1a69..088af32 100644
--- a/frontend/src/app/containers/region-details/region-details.component.html
+++ b/frontend/src/app/containers/region-details/region-details.component.html
@@ -27,40 +27,27 @@
-
+
-
-
+
-
+
diff --git a/frontend/src/app/containers/search/search.component.ts b/frontend/src/app/containers/search/search.component.ts
index 470a2cf..5676a16 100644
--- a/frontend/src/app/containers/search/search.component.ts
+++ b/frontend/src/app/containers/search/search.component.ts
@@ -53,8 +53,8 @@ export class SearchComponent implements OnInit {
this.sortOptions = [
{name: 'Relevance', property: 'score', descending: true},
- {name: 'Name', property: 'name'},
- {name: 'Accommodation', property: 'accommodation_costs'}
+ {name: 'Region name', property: 'name'},
+ {name: 'Accommodation price', property: 'accommodation_costs'}
];
if (this.results.length > 0) {
diff --git a/frontend/src/app/services/data.service.ts b/frontend/src/app/services/data.service.ts
index 7208192..4d021e9 100644
--- a/frontend/src/app/services/data.service.ts
+++ b/frontend/src/app/services/data.service.ts
@@ -90,60 +90,144 @@ export class DataService {
export const REGION_PARAM_VIS: RegionParamVisLookup = {
temperature_mean: {
icon: 'wb_sunny',
- unit: '°C'
+ unit: '°C',
+ decimals: '1.0-0'
},
temperature_mean_min: {
icon: 'wb_sunny',
- unit: '°C'
+ unit: '°C',
+ decimals: '1.0-0'
},
temperature_mean_max: {
icon: 'wb_sunny',
- unit: '°C'
+ unit: '°C',
+ decimals: '1.0-0'
},
precipitation: {
icon: 'opacity',
- unit: 'mm'
+ unit: 'mm',
+ decimals: '1.0-0'
},
humidity: {
icon: 'grain',
- unit: '%'
+ unit: '%',
+ decimals: '1.0-0'
},
sun_hours: {
icon: 'flare',
- unit: 'h'
+ unit: 'h',
+ decimals: '1.0-0'
},
rain_days: {
icon: 'date_range',
- unit: ''
+ unit: '',
+ decimals: '1.0-0'
},
food_costs: {
icon: 'local_dining',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.0-0'
},
alcohol_costs: {
icon: 'local_bar',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.2-2'
},
water_costs: {
icon: 'local_cafe',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.2-2'
},
local_transportation_costs: {
icon: 'commute',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.2-2'
},
entertainment_costs: {
icon: 'local_activity',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.2-2'
},
accommodation_costs: {
icon: 'hotel',
- unit: '€/day'
+ unit: '€/day',
+ decimals: '1.2-2'
},
average_per_day_costs: {
icon: 'euro',
- unit: '€/day'
- }
+ unit: '€/day',
+ decimals: '1.2-2'
+ },
+ avg_price_relative: {
+ icon: 'hotel',
+ unit: '%',
+ decimals: '1.1-1'
+ },
+ beach: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ history: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ nature: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ art: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ culture: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ mountains: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ architecture: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ rainforest: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ nightlife: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ desert: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ food: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ shopping: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
+ volcanoes: {
+ icon: 'stars',
+ unit: '%',
+ decimals: '1.0-0'
+ },
};
export interface RegionParamVisLookup {
@@ -153,4 +237,5 @@ export interface RegionParamVisLookup {
export interface RegionParamVis {
icon: string;
unit: string;
+ decimals: string;
}
diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json
index 758586e..569dc1d 100644
--- a/frontend/src/assets/i18n/en.json
+++ b/frontend/src/assets/i18n/en.json
@@ -1,33 +1,48 @@
{
- "temperature_mean_max": "Max Temperature Average",
+ "temperature_mean_max": "Day temperature",
"temperature": "Temperature",
- "rain_days": "Rainy days",
- "sun_hours": "Sunny hours",
+ "rain_days": "Rain days",
+ "sun_hours": "Sunshine",
"precipitation": "Precipitation",
"humidity": "Humidity",
"alcohol_costs": "Alcohol",
"food_costs": "Food",
"water_costs": "Water",
- "cheap_alcohol": "Cheap alcohol",
+ "cheap_alcohol": "cheap alcohol",
"local_transportation_costs": "Public transport",
"average_per_day_costs": "Total costs",
"entertainment_costs": "Entertainment",
- "accommodation_costs": "Accommodation",
- "cheap_food": "Cheap food",
- "cheap_water": "Cheap water",
- "cheap_transportations": "Cheap public transport",
- "cheap_entertainment": "Cheap entertainment",
- "cheap_accommodation": "Cheap accommodation",
- "off_season": "Off-season",
+ "accommodation_costs": "Accommodation price",
+ "avg_price_relative": "Price tendency",
+ "cheap_food": "cheap food",
+ "cheap_water": "cheap water",
+ "cheap_transportations": "cheap public transport",
+ "cheap_entertainment": "cheap entertainment",
+ "cheap_accommodation": "cheap accommodation",
+ "off_season": "low season",
"warm": "warm",
"chilly": "cold",
"mild:": "mild",
"cold": "freezing",
- "sunny": "sunny",
- "dark": "dark",
- "almost_no_rain": "almost none",
- "little_rain": "little",
- "floodlike_rain": "flooding",
+ "sunny": "all day long",
+ "dark": "the sun scares me",
+ "normal": "better not so much",
+ "almost_no_rain": "no rain",
+ "little_rain": "a little is good",
+ "floodlike_rain": "i like it pouring",
"few_raindays": "few",
- "many_raindays": "many"
+ "many_raindays": "many",
+ "art": "Art",
+ "beach": "Beach",
+ "history": "History",
+ "nature": "Nature",
+ "culture": "Culture",
+ "mountains": "Mountains",
+ "architecture": "Architecture",
+ "rainforest": "Rainforest",
+ "desert": "Desert",
+ "food": "Food",
+ "shopping": "Shopping",
+ "volcanoes": "Volcanoes",
+ "nightlife": "Nightlife"
}
|