diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 967446ee73..2db18bebd2 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -285,24 +285,26 @@ geocoding-providers: speed: '2.2' curve: '1.42' default-position: - - 2.335062 - - 48.879162 + - 42.488 + - 3.779 default-zoom: 2 marker-default-zoom: 11 - position-fields: [] + position-fields: #- # name: GpsCompositePosition # type: latlng - # - - # name: Longitude - # type: lon - # - - # name: Latitude - # type: lat + - + name: Latitude + type: lat + - + name: Longitude + type: lon geonames-field-mapping: true cityfields: 'City, Ville' provincefields: Province countryfields: 'Country, Pays' + latitudefields: Latitude + longitudefields: Longitude video-editor: ChapterVttFieldName: VideoTextTrackChapters seekBackwardStep: 500 # in ms diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 83e7e139fc..8853948f56 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -5,12 +5,13 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 + 300 yes 75 yes + yes screen image @@ -18,22 +19,25 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes - 75 + 50 no + yes screen image - 480 + 640 72 + resample yes 75 + yes {{datapathnoweb}}{{basename}}/subdefs image no @@ -42,10 +46,12 @@ - 150 + 192 72 + resample yes - 75 + yes + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -57,7 +63,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -66,7 +72,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 250 gif 150 screen @@ -147,7 +153,7 @@ {{datapathnoweb}}{{basename}}/subdefs image - 240 + 384 screen no @@ -177,7 +183,8 @@ image resample 72 - 240 + 380 + yes no screen diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index 81ce397169..6b0125af58 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 - no + 300 + yes + yes 75 yes screen @@ -18,11 +19,12 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes - 75 + yes + 50 no screen image @@ -30,9 +32,10 @@ - 480 + 640 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,10 +45,11 @@ - 150 + 192 72 yes - 75 + yes + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -90,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748 @@ -110,7 +129,7 @@ {{datapathnoweb}}{{basename}}/subdefs image - 240 + 384 screen no @@ -140,7 +159,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -155,30 +175,6 @@ - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - - @@ -199,8 +195,8 @@ - - + + diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 48d628cedd..0dc46ebfd4 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 - no + 300 + yes + yes 75 yes screen @@ -18,11 +19,12 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes - 75 + yes + 50 no screen image @@ -30,9 +32,10 @@ - 480 + 640 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,10 +45,11 @@ - 150 + 190 72 yes - 75 + yes + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -90,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748 @@ -140,7 +159,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -155,30 +175,6 @@ - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - - @@ -199,8 +195,8 @@ - - + + diff --git a/lib/conf.d/data_templates/gs1.xml b/lib/conf.d/data_templates/gs1.xml index 3ace5361c3..b1a6a7610d 100644 --- a/lib/conf.d/data_templates/gs1.xml +++ b/lib/conf.d/data_templates/gs1.xml @@ -5,10 +5,11 @@ {{datapathnoweb}}{{basename}}/subdefs - 1024 + 1280 resample - 72 + 300 no + yes 75 yes screen @@ -18,11 +19,12 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 resample 72 yes - 75 + yes + 50 no screen image @@ -30,9 +32,10 @@ - 480 + 640 72 yes + yes 75 {{datapathnoweb}}{{basename}}/subdefs image @@ -42,10 +45,11 @@ - 150 + 192 72 yes - 75 + yes + 50 {{datapathnoweb}}{{basename}}/subdefs image no @@ -57,7 +61,7 @@ {{datapathnoweb}}{{basename}}/subdefs - 240 + 384 screen image no @@ -90,6 +94,21 @@ + + {{datapathnoweb}}{{basename}}/subdefs + 1 + 1280 + image + yes + screen + 72 + yes + yes + 75 + jpeg + + + {{datapathnoweb}}{{basename}}/subdefs 748 @@ -140,7 +159,8 @@ image resample 72 - 240 + 384 + yes no screen @@ -148,37 +168,13 @@ {{datapathnoweb}}{{basename}}/subdefs - flexpaper + pdf no screen - - - {{datapathnoweb}}{{basename}}/subdefs - image - 240 - no - resample - 72 - screen - - - - - {{datapathnoweb}}{{basename}}/subdefs - image - 800 - no - resample - 72 - screen - - - -