From eb9bb494b8a7ebccb34d0eaefc13a202bd60a985 Mon Sep 17 00:00:00 2001 From: Jeffrey Kemp Date: Mon, 22 Jul 2019 20:39:08 +0800 Subject: [PATCH] simplify; move more code into js file; use onload to init map --- apexplugin.json | 2 +- ...ugin_com_jk64_report_google_map_r1_503.sql | 4 +- demo_app.sql | 325 ++++++++++-------- ...e_plugin_com_jk64_report_google_map_r1.sql | 250 +++++++------- src/jk64reportmap_r1.js | 5 +- src/jk64reportmap_r1.min.js | 2 +- src/jk64reportmap_r1_pkg.sql | 101 +++--- 7 files changed, 373 insertions(+), 316 deletions(-) diff --git a/apexplugin.json b/apexplugin.json index 9dd076c..d63a8fa 100644 --- a/apexplugin.json +++ b/apexplugin.json @@ -23,7 +23,7 @@ "oracle" : { "versions" : ["11.2.0.1", "12.1.0.1", "18.0.0.0"], "apex" : { - "versions" : ["18.2.0"], + "versions" : ["5.0.3","5.1.0","18.1.0","18.2.0"], "plugin" : { "internalName" : "COM.JK64.REPORT_GOOGLE_MAP_R1", "type" : "region", diff --git a/backport/region_type_plugin_com_jk64_report_google_map_r1_503.sql b/backport/region_type_plugin_com_jk64_report_google_map_r1_503.sql index 4d9cec8..e668d86 100644 --- a/backport/region_type_plugin_com_jk64_report_google_map_r1_503.sql +++ b/backport/region_type_plugin_com_jk64_report_google_map_r1_503.sql @@ -34,7 +34,7 @@ wwv_flow_api.create_plugin( ,p_display_name=>'JK64 Report Google Map R1' ,p_supported_ui_types=>'DESKTOP:JQM_SMARTPHONE' ,p_plsql_code=>wwv_flow_utilities.join(wwv_flow_t_varchar2( -'-- jk64 ReportMap v1.0 BACKPORT Jul 2019', +'-- jk64 ReportMap v1.0.1 BACKPORT Jul 2019', '', '-- format to use to convert a string to a number', 'g_num_format constant varchar2(100) := ''99999999999999.999999999999999999999999999999'';', @@ -592,7 +592,7 @@ wwv_flow_api.create_plugin( 'Refer to the wiki for documentation and examples:', '

', 'https://github.com/jeffreykemp/jk64-plugin-reportmap/wiki')) -,p_version_identifier=>'1.0 BACKPORT' +,p_version_identifier=>'1.0.1 BACKPORT' ,p_about_url=>'https://jeffreykemp.github.io/jk64-plugin-reportmap/' ,p_plugin_comment=>'Backported to APEX 5.0.3; some documented features might not have been implemented.' ,p_files_version=>93 diff --git a/demo_app.sql b/demo_app.sql index 45a51db..a4a2f44 100644 --- a/demo_app.sql +++ b/demo_app.sql @@ -27,7 +27,7 @@ prompt APPLICATION 15181 - Demo Report Map Plugin -- Application Export: -- Application: 15181 -- Name: Demo Report Map Plugin --- Date and Time: 23:56 Sunday July 21, 2019 +-- Date and Time: 20:36 Monday July 22, 2019 -- Exported By: JEFF -- Flashback: 0 -- Export Type: Application Export @@ -111,7 +111,7 @@ wwv_flow_api.create_flow( ,p_substitution_string_01=>'REPOSITORY' ,p_substitution_value_01=>'https://github.com/jeffreykemp/jk64-plugin-reportmap' ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721235626' +,p_last_upd_yyyymmddhh24miss=>'20190722203536' ,p_file_prefix => nvl(wwv_flow_application_install.get_static_app_file_prefix,'') ,p_files_version=>15 ,p_ui_type_name => null @@ -10416,7 +10416,7 @@ wwv_flow_api.create_plugin( 'end latlng_literal;', '', 'procedure parse_latlng (p_val in varchar2, p_label in varchar2, p_lat out number, p_lng out number) is', -' delim_pos varchar2(1);', +' delim_pos number;', 'begin', ' -- allow space as the delimiter; this should be used in locales which use comma (,) as decimal separator', ' if instr(trim(p_val),'' '') > 0 then', @@ -10428,6 +10428,30 @@ wwv_flow_api.create_plugin( ' p_lng := apex_plugin_util.get_attribute_as_number(substr(p_val,delim_pos+1), p_label || '' longitude'');', 'end parse_latlng;', '', +'function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is', +' n number;', +'begin', +' n := apex_plugin_util.get_attribute_as_number(p_attr, p_label);', +' if not n between 0 and 23 then', +' raise_application_error(-20000, p_label || '': must be in range 0..23 ("'' || p_attr || ''")'');', +' end if;', +' return n;', +'end valid_zoom_level;', +'', +'procedure get_lat_lng_attr', +' (lat_val in varchar2', +' ,lng_val in varchar2', +' ,record_no in number', +' ,p_lat out number', +' ,p_lng out number', +' ) is', +'begin', +' p_lat := round(apex_plugin_util.get_attribute_as_number(lat_val,''Latitude (#''||record_no||'')'')', +' ,g_coord_precision);', +' p_lng := round(apex_plugin_util.get_attribute_as_number(lng_val,''Longitude (#''||record_no||'')'')', +' ,g_coord_precision);', +'end get_lat_lng_attr;', +'', 'function get_markers', ' (p_plugin in apex_plugin.t_plugin', ' ,p_region in apex_plugin.t_region', @@ -10447,7 +10471,7 @@ wwv_flow_api.create_plugin( ' l_max_rows number; --p_plugin.attribute_07;', ' l_visualisation plugin_attr := p_region.attribute_02;', ' l_escape_special_chars plugin_attr := p_region.attribute_24;', -' ', +'', ' function flex_field (attr_no in number, i in number) return varchar2 is', ' d varchar2(4000);', ' begin', @@ -10459,7 +10483,7 @@ wwv_flow_api.create_plugin( ' end if;', ' return apex_javascript.add_attribute(''a''||attr_no,d);', ' end flex_field;', -' ', +' ', ' function varchar2_field (attr_no in number, i in number) return varchar2 is', ' r varchar2(4000);', ' begin', @@ -10468,7 +10492,7 @@ wwv_flow_api.create_plugin( ' end if;', ' return r;', ' end varchar2_field;', -'', +' ', 'begin', '', ' /*', @@ -10504,13 +10528,18 @@ wwv_flow_api.create_plugin( ' ', ' for i in 1..l_column_value_list(1).count loop', ' ', -' l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),''Latitude (#''||i||'')''),g_coord_precision);', -' l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),''Longitude (#''||i||'')''),g_coord_precision);', +' get_lat_lng_attr', +' (lat_val => l_column_value_list(1)(i)', +' ,lng_val => l_column_value_list(2)(i)', +' ,record_no => i', +' ,p_lat => l_lat', +' ,p_lng => l_lng);', +'', ' l_weight := nvl(round(', ' apex_plugin_util.get_attribute_as_number(l_column_value_list(3)(i),''Weight (#''||i||'')'')', ' ),1);', ' ', -' -- minimise size of data to be sent', +' -- minimise size of data to be sent by encoding it as an array of arrays', ' l_buf := ''['' || to_char(l_lat,g_tochar_format)', ' || '','' || to_char(l_lng,g_tochar_format)', ' || '','' || to_char(greatest(l_weight,1))', @@ -10542,8 +10571,12 @@ wwv_flow_api.create_plugin( ' ', ' for i in 1..l_column_value_list(1).count loop', '', -' l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),''Latitude (#''||i||'')''),g_coord_precision);', -' l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),''Longitude (#''||i||'')''),g_coord_precision);', +' get_lat_lng_attr', +' (lat_val => l_column_value_list(1)(i)', +' ,lng_val => l_column_value_list(2)(i)', +' ,record_no => i', +' ,p_lat => l_lat', +' ,p_lng => l_lng);', ' ', ' -- get flex fields, if any', ' l_flex := null;', @@ -10633,18 +10666,7 @@ wwv_flow_api.create_plugin( ' l_gesture_handling plugin_attr := p_region.attribute_25;', ' ', ' l_opt varchar2(32767);', -' l_buf varchar2(32767);', ' ', -' function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is', -' n number;', -' begin', -' n := apex_plugin_util.get_attribute_as_number(p_attr, p_label);', -' if not n between 0 and 23 then', -' raise_application_error(-20000, p_label || '': must be in range 0..23 ("'' || p_attr || ''")'');', -' end if;', -' return n;', -' end valid_zoom_level;', -'', 'begin', ' -- debug information will be included', ' if apex_application.g_debug then', @@ -10658,13 +10680,6 @@ wwv_flow_api.create_plugin( ' raise_application_error(-20000, ''Google Maps API Key is required (set in Component Settings)'');', ' end if;', ' ', -' l_min_zoom := valid_zoom_level(p_plugin.attribute_05, ''Min. Zoom'');', -' l_max_zoom := valid_zoom_level(p_plugin.attribute_06, ''Max. Zoom'');', -' l_click_zoom_level := valid_zoom_level(p_region.attribute_03, ''Zoom Level on Click'');', -' l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, ''Initial Zoom Level'');', -' l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, ''Heatmap Opacity'');', -' l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, ''Heatmap Radius'');', -' ', ' apex_javascript.add_library', ' (p_name => ''js?key='' || l_api_key', ' || case when l_visualisation = g_visualisation_heatmap then', @@ -10691,11 +10706,19 @@ wwv_flow_api.create_plugin( ' else ''R''||p_region.id', ' end;', ' apex_debug.message(''map region: '' || l_region_id);', +'', +' l_min_zoom := valid_zoom_level(p_plugin.attribute_05, ''Min. Zoom'');', +' l_max_zoom := valid_zoom_level(p_plugin.attribute_06, ''Max. Zoom'');', +' l_click_zoom_level := valid_zoom_level(p_region.attribute_03, ''Zoom Level on Click'');', +' l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, ''Initial Zoom Level'');', +' l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, ''Heatmap Opacity'');', +' l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, ''Heatmap Radius'');', ' ', ' if l_initial_center is not null then', ' parse_latlng(l_initial_center, p_label=>''Initial Map Center'', p_lat=>l_lat, p_lng=>l_lng);', ' end if;', ' ', +' -- use nullif to convert default values to null; this reduces the footprint of the generated code', ' l_opt := ''{''', ' || apex_javascript.add_attribute(''regionId'', l_region_id)', ' || apex_javascript.add_attribute(''expectData'', nullif(p_region.source is not null,true))', @@ -10743,22 +10766,14 @@ wwv_flow_api.create_plugin( ' || apex_javascript.add_attribute(''pluginFilePrefix'', p_plugin.file_prefix', ' ,false,false)', ' || ''}'';', -' ', -' -- we don''t want the initialisation to run until after the page is loaded including all resources; the r_ function', -' -- method here waits until the document is ready before running the jquery plugin initialisation', -' l_buf := ''', -'', -'

'';', -' ', -' sys.htp.p(replace(l_buf,''#REGION_ID#'',l_region_id));', +'', +' apex_debug.message(''map options: '' || l_opt);', +' ', +' apex_javascript.add_onload_code(p_code =>', +' ''$("#map_'' || l_region_id || ''").reportmap('' || l_opt || '');''', +' );', +' ', +' sys.htp.p(''
'');', ' ', ' return l_result;', 'exception', @@ -10870,7 +10885,7 @@ wwv_flow_api.create_plugin( 'https://github.com/jeffreykemp/jk64-plugin-reportmap/wiki')) ,p_version_identifier=>'1.0.1' ,p_about_url=>'https://jeffreykemp.github.io/jk64-plugin-reportmap/' -,p_files_version=>242 +,p_files_version=>246 ); wwv_flow_api.create_plugin_attribute( p_id=>wwv_flow_api.id(33032357089766730) @@ -12655,55 +12670,57 @@ wwv_flow_api.g_varchar2_table(176) := '696F6E732E6F7074696D697A65576179706F696E7 wwv_flow_api.g_varchar2_table(177) := '2020207D2C2066756E6374696F6E28726573706F6E73652C737461747573297B5F746869732E5F646972656374696F6E73526573706F6E736528726573706F6E73652C737461747573297D293B0D0A2020202020207D20656C7365207B0D0A2020202020'; wwv_flow_api.g_varchar2_table(178) := '202020617065782E646562756728226E6F7420656E6F75676820776179706F696E7473202D206E656564206174206C6561737420616E206F726967696E20616E6420612064657374696E6174696F6E20706F696E7422293B0D0A2020202020207D0D0A20'; wwv_flow_api.g_varchar2_table(179) := '2020207D2C0D0A0D0A202020202F2F2054686520636F6E7374727563746F720D0A202020205F6372656174653A2066756E6374696F6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E5F63726561746520222B7468'; -wwv_flow_api.g_varchar2_table(180) := '69732E656C656D656E742E70726F70282269642229293B0D0A202020202020617065782E646562756728226F7074696F6E733A20222B4A534F4E2E737472696E6769667928746869732E6F7074696F6E7329293B0D0A2020202020202F2F206765742061'; -wwv_flow_api.g_varchar2_table(181) := '62736F6C7574652055524C20666F72207468697320736974652C20696E636C7564696E67202F617065782F206F72202F6F7264732F20287468697320697320726571756972656420627920736F6D6520676F6F676C65206D6170732041504973290D0A20'; -wwv_flow_api.g_varchar2_table(182) := '20202020207661722066696C6550617468203D2077696E646F772E6C6F636174696F6E2E6F726967696E202B2077696E646F772E6C6F636174696F6E2E706174686E616D653B0D0A20202020202066696C6550617468203D2066696C65506174682E7375'; -wwv_flow_api.g_varchar2_table(183) := '62737472696E6728302C2066696C65506174682E6C617374496E6465784F6628222F2229293B0D0A202020202020746869732E696D616765507265666978203D2066696C6550617468202B20222F22202B20746869732E6F7074696F6E732E706C756769'; -wwv_flow_api.g_varchar2_table(184) := '6E46696C65507265666978202B2022696D616765732F6D223B0D0A202020202020617065782E64656275672827746869732E696D6167655072656669783D22272B746869732E696D6167655072656669782B272227293B0D0A202020202020766172206D'; -wwv_flow_api.g_varchar2_table(185) := '794F7074696F6E73203D207B0D0A20202020202020206D696E5A6F6F6D3A20746869732E6F7074696F6E732E6D696E5A6F6F6D2C0D0A20202020202020206D61785A6F6F6D3A20746869732E6F7074696F6E732E6D61785A6F6F6D2C0D0A202020202020'; -wwv_flow_api.g_varchar2_table(186) := '20207A6F6F6D3A20746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C0D0A202020202020202063656E7465723A20746869732E6F7074696F6E732E696E697469616C43656E7465722C0D0A20202020202020206D61705479706549643A2074'; -wwv_flow_api.g_varchar2_table(187) := '6869732E6F7074696F6E732E6D6170547970652C0D0A2020202020202020647261676761626C653A20746869732E6F7074696F6E732E616C6C6F7750616E2C0D0A20202020202020207A6F6F6D436F6E74726F6C3A20746869732E6F7074696F6E732E61'; -wwv_flow_api.g_varchar2_table(188) := '6C6C6F775A6F6F6D2C0D0A20202020202020207363726F6C6C776865656C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A202020202020202064697361626C65446F75626C65436C69636B5A6F6F6D3A202128746869732E6F707469'; -wwv_flow_api.g_varchar2_table(189) := '6F6E732E616C6C6F775A6F6F6D292C0D0A20202020202020206765737475726548616E646C696E673A20746869732E6F7074696F6E732E6765737475726548616E646C696E670D0A2020202020207D3B0D0A20202020202069662028746869732E6F7074'; -wwv_flow_api.g_varchar2_table(190) := '696F6E732E6D61705374796C6529207B0D0A20202020202020206D794F7074696F6E735B227374796C6573225D203D20746869732E6F7074696F6E732E6D61705374796C653B0D0A2020202020207D0D0A202020202020746869732E6D6170203D206E65'; -wwv_flow_api.g_varchar2_table(191) := '7720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E744279496428746869732E656C656D656E742E70726F70282269642229292C6D794F7074696F6E73293B0D0A20202020202069662028746869732E6F7074696F'; -wwv_flow_api.g_varchar2_table(192) := '6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F7274686561737429207B0D0A2020202020202020746869732E6D61702E666974426F756E6473286E657720676F6F676C652E6D6170732E4C61744C6E67426F756E647328746869'; -wwv_flow_api.g_varchar2_table(193) := '732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B0D0A2020202020207D0D0A202020202020766172205F74686973203D20746869733B0D0A202020202020676F6F676C652E6D6170732E65'; +wwv_flow_api.g_varchar2_table(180) := '69732E656C656D656E742E70726F70282269642229293B0D0A202020202020617065782E646562756728226F7074696F6E733A20222B4A534F4E2E737472696E6769667928746869732E6F7074696F6E7329293B0D0A202020202020766172205F746869'; +wwv_flow_api.g_varchar2_table(181) := '73203D20746869733B0D0A2020202020202F2F20676574206162736F6C7574652055524C20666F72207468697320736974652C20696E636C7564696E67202F617065782F206F72202F6F7264732F20287468697320697320726571756972656420627920'; +wwv_flow_api.g_varchar2_table(182) := '736F6D6520676F6F676C65206D6170732041504973290D0A2020202020207661722066696C6550617468203D2077696E646F772E6C6F636174696F6E2E6F726967696E202B2077696E646F772E6C6F636174696F6E2E706174686E616D653B0D0A202020'; +wwv_flow_api.g_varchar2_table(183) := '20202066696C6550617468203D2066696C65506174682E737562737472696E6728302C2066696C65506174682E6C617374496E6465784F6628222F2229293B0D0A202020202020746869732E696D616765507265666978203D2066696C6550617468202B'; +wwv_flow_api.g_varchar2_table(184) := '20222F22202B20746869732E6F7074696F6E732E706C7567696E46696C65507265666978202B2022696D616765732F6D223B0D0A202020202020617065782E64656275672827746869732E696D6167655072656669783D22272B746869732E696D616765'; +wwv_flow_api.g_varchar2_table(185) := '5072656669782B272227293B0D0A202020202020766172206D794F7074696F6E73203D207B0D0A20202020202020206D696E5A6F6F6D3A20746869732E6F7074696F6E732E6D696E5A6F6F6D2C0D0A20202020202020206D61785A6F6F6D3A2074686973'; +wwv_flow_api.g_varchar2_table(186) := '2E6F7074696F6E732E6D61785A6F6F6D2C0D0A20202020202020207A6F6F6D3A20746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C0D0A202020202020202063656E7465723A20746869732E6F7074696F6E732E696E697469616C43656E74'; +wwv_flow_api.g_varchar2_table(187) := '65722C0D0A20202020202020206D61705479706549643A20746869732E6F7074696F6E732E6D6170547970652C0D0A2020202020202020647261676761626C653A20746869732E6F7074696F6E732E616C6C6F7750616E2C0D0A20202020202020207A6F'; +wwv_flow_api.g_varchar2_table(188) := '6F6D436F6E74726F6C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A20202020202020207363726F6C6C776865656C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A202020202020202064697361626C65446F75'; +wwv_flow_api.g_varchar2_table(189) := '626C65436C69636B5A6F6F6D3A202128746869732E6F7074696F6E732E616C6C6F775A6F6F6D292C0D0A20202020202020206765737475726548616E646C696E673A20746869732E6F7074696F6E732E6765737475726548616E646C696E670D0A202020'; +wwv_flow_api.g_varchar2_table(190) := '2020207D3B0D0A20202020202069662028746869732E6F7074696F6E732E6D61705374796C6529207B0D0A20202020202020206D794F7074696F6E735B227374796C6573225D203D20746869732E6F7074696F6E732E6D61705374796C653B0D0A202020'; +wwv_flow_api.g_varchar2_table(191) := '2020207D0D0A202020202020746869732E6D6170203D206E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E744279496428746869732E656C656D656E742E70726F70282269642229292C6D794F7074696F6E'; +wwv_flow_api.g_varchar2_table(192) := '73293B0D0A20202020202069662028746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F7274686561737429207B0D0A2020202020202020746869732E6D61702E666974426F756E6473286E657720676F6F'; +wwv_flow_api.g_varchar2_table(193) := '676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B0D0A2020202020207D0D0A202020202020676F6F676C652E6D6170732E65'; wwv_flow_api.g_varchar2_table(194) := '76656E742E6164644C697374656E657228746869732E6D61702C2022636C69636B222C2066756E6374696F6E20286576656E7429207B0D0A2020202020202020617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E'; wwv_flow_api.g_varchar2_table(195) := '67696679286576656E742E6C61744C6E6729293B0D0A2020202020202020696620285F746869732E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C29207B0D0A20202020202020202020617065782E6465627567282270616E2B7A6F6F6D22293B'; wwv_flow_api.g_varchar2_table(196) := '0D0A20202020202020202020696620285F746869732E6F7074696F6E732E70616E4F6E436C69636B29207B0D0A2020202020202020202020205F746869732E6D61702E70616E546F286576656E742E6C61744C6E67293B0D0A202020202020202020207D'; wwv_flow_api.g_varchar2_table(197) := '0D0A202020202020202020205F746869732E6D61702E7365745A6F6F6D285F746869732E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C293B0D0A20202020202020207D0D0A2020202020202020617065782E6A5175657279282223222B5F7468'; wwv_flow_api.g_varchar2_table(198) := '69732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C207B6D61703A5F746869732E6D61702C206C61743A6576656E742E6C61744C6E672E6C617428292C206C6E673A6576656E742E6C61744C6E672E6C6E'; -wwv_flow_api.g_varchar2_table(199) := '6728297D293B0D0A2020202020207D293B0D0A20202020202069662028746869732E6F7074696F6E732E696E6974466E29207B0D0A2020202020202020617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64'; -wwv_flow_api.g_varchar2_table(200) := '652E2E2E22293B0D0A20202020202020202F2F696E736964652074686520696E697428292066756E6374696F6E2077652077616E742022746869732220746F20726566657220746F20746869730D0A2020202020202020746869732E696E69743D746869'; -wwv_flow_api.g_varchar2_table(201) := '732E6F7074696F6E732E696E6974466E3B0D0A2020202020202020746869732E696E697428293B0D0A2020202020207D0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A202020202020202074686973'; -wwv_flow_api.g_varchar2_table(202) := '2E7265667265736828293B0D0A2020202020207D0D0A202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C207B6D61703A746869732E6D61'; -wwv_flow_api.g_varchar2_table(203) := '707D293B0D0A202020202020617065782E646562756728227265706F72746D61702E696E69742066696E697368656422293B0D0A202020207D2C0D0A202020200D0A202020202F2F2043616C6C6564207768656E20637265617465642C20616E64206C61'; -wwv_flow_api.g_varchar2_table(204) := '746572207768656E206368616E67696E67206F7074696F6E730D0A20202020726566726573683A2066756E6374696F6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E7265667265736822293B0D0A202020202020'; -wwv_flow_api.g_varchar2_table(205) := '746869732E5F686964654D65737361676528293B0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A2020202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567'; -wwv_flow_api.g_varchar2_table(206) := '696F6E4964292E747269676765722822617065786265666F72657265667265736822293B0D0A2020202020202020766172205F74686973203D20746869733B0D0A2020202020202020617065782E7365727665722E706C7567696E0D0A20202020202020'; -wwv_flow_api.g_varchar2_table(207) := '20202028746869732E6F7074696F6E732E616A61784964656E7469666965720D0A202020202020202020202C7B20706167654974656D733A20746869732E6F7074696F6E732E616A61784974656D73207D0D0A202020202020202020202C7B2064617461'; -wwv_flow_api.g_varchar2_table(208) := '547970653A20226A736F6E220D0A2020202020202020202020202C737563636573733A2066756E6374696F6E282070446174612029207B0D0A2020202020202020202020202020617065782E646562756728227375636365737320736F75746877657374'; -wwv_flow_api.g_varchar2_table(209) := '3D222B4A534F4E2E737472696E676966792870446174612E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E676966792870446174612E6E6F7274686561737429293B0D0A20202020202020202020202020205F74'; -wwv_flow_api.g_varchar2_table(210) := '6869732E6D61702E666974426F756E6473280D0A202020202020202020202020202020207B736F7574683A70446174612E736F757468776573742E6C61740D0A202020202020202020202020202020202C776573743A2070446174612E736F7574687765'; -wwv_flow_api.g_varchar2_table(211) := '73742E6C6E670D0A202020202020202020202020202020202C6E6F7274683A70446174612E6E6F727468656173742E6C61740D0A202020202020202020202020202020202C656173743A2070446174612E6E6F727468656173742E6C6E677D293B0D0A20'; -wwv_flow_api.g_varchar2_table(212) := '20202020202020202020202020696620285F746869732E696E666F57696E646F7729207B0D0A202020202020202020202020202020205F746869732E696E666F57696E646F772E636C6F736528293B0D0A20202020202020202020202020207D0D0A2020'; -wwv_flow_api.g_varchar2_table(213) := '202020202020202020202020617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B70446174612E6D6170646174612E6C656E677468293B0D0A20202020202020202020202020205F746869732E5F72656D6F76654D61'; -wwv_flow_api.g_varchar2_table(214) := '726B65727328293B0D0A20202020202020202020202020206966202870446174612E6D61706461746129207B0D0A202020202020202020202020202020205F746869732E5F73686F77446174612870446174612E6D617064617461293B0D0A2020202020'; -wwv_flow_api.g_varchar2_table(215) := '2020202020202020202020696620285F746869732E6F7074696F6E732E76697375616C69736174696F6E3D3D22646972656374696F6E732229207B0D0A2020202020202020202020202020202020205F746869732E5F646972656374696F6E7328704461'; -wwv_flow_api.g_varchar2_table(216) := '74612E6D617064617461293B0D0A202020202020202020202020202020207D0D0A20202020202020202020202020207D0D0A2020202020202020202020202020617065782E6A5175657279282223222B5F746869732E6F7074696F6E732E726567696F6E'; -wwv_flow_api.g_varchar2_table(217) := '4964292E7472696767657228226170657861667465727265667265736822293B0D0A2020202020202020202020207D0D0A202020202020202020207D20293B0D0A2020202020207D0D0A202020202020617065782E646562756728227265706F72746D61'; -wwv_flow_api.g_varchar2_table(218) := '702E726566726573682066696E697368656422293B0D0A2020202020202F2F205472696767657220612063616C6C6261636B2F6576656E740D0A202020202020746869732E5F747269676765722820226368616E67652220293B0D0A202020207D2C0D0A'; -wwv_flow_api.g_varchar2_table(219) := '0D0A202020202F2F204576656E747320626F756E6420766961205F6F6E206172652072656D6F766564206175746F6D61746963616C6C790D0A202020202F2F20726576657274206F74686572206D6F64696669636174696F6E7320686572650D0A202020'; -wwv_flow_api.g_varchar2_table(220) := '205F64657374726F793A2066756E6374696F6E2829207B0D0A2020202020202F2F2072656D6F76652067656E65726174656420656C656D656E74730D0A20202020202069662028746869732E686561746D61704C6179657229207B20746869732E686561'; -wwv_flow_api.g_varchar2_table(221) := '746D61704C617965722E72656D6F766528293B207D0D0A20202020202069662028746869732E7573657270696E29207B2064656C65746520746869732E7573657270696E3B207D0D0A20202020202069662028746869732E646972656374696F6E734469'; -wwv_flow_api.g_varchar2_table(222) := '73706C617929207B2064656C65746520746869732E646972656374696F6E73446973706C61793B207D0D0A20202020202069662028746869732E646972656374696F6E735365727669636529207B2064656C65746520746869732E646972656374696F6E'; -wwv_flow_api.g_varchar2_table(223) := '73536572766963653B207D0D0A202020202020746869732E5F72656D6F76654D61726B65727328293B0D0A202020202020746869732E5F686964654D65737361676528293B0D0A202020202020746869732E6D61702E72656D6F766528293B0D0A202020'; -wwv_flow_api.g_varchar2_table(224) := '207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E732069732063616C6C6564207769746820612068617368206F6620616C6C206F7074696F6E73207468617420617265206368616E67696E670D0A202020202F2F20616C776179732072656672'; -wwv_flow_api.g_varchar2_table(225) := '657368207768656E206368616E67696E67206F7074696F6E730D0A202020205F7365744F7074696F6E733A2066756E6374696F6E2829207B0D0A2020202020202F2F205F737570657220616E64205F73757065724170706C792068616E646C65206B6565'; -wwv_flow_api.g_varchar2_table(226) := '70696E672074686520726967687420746869732D636F6E746578740D0A202020202020746869732E5F73757065724170706C792820617267756D656E747320293B0D0A202020202020746869732E7265667265736828293B0D0A202020207D2C0D0A0D0A'; -wwv_flow_api.g_varchar2_table(227) := '202020202F2F205F7365744F7074696F6E2069732063616C6C656420666F72206561636820696E646976696475616C206F7074696F6E2074686174206973206368616E67696E670D0A202020205F7365744F7074696F6E3A2066756E6374696F6E28206B'; -wwv_flow_api.g_varchar2_table(228) := '65792C2076616C75652029207B0D0A202020202020746869732E5F737570657228206B65792C2076616C756520293B0D0A202020207D2020202020200D0A0D0A20207D293B0D0A7D293B'; +wwv_flow_api.g_varchar2_table(199) := '6728297D293B0D0A2020202020207D293B0D0A202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E62696E6428226170657872656672657368222C66756E6374696F6E28297B0D0A20202020'; +wwv_flow_api.g_varchar2_table(200) := '20202020242822236D61705F222B5F746869732E6F7074696F6E732E726567696F6E4964292E7265706F72746D617028227265667265736822293B0D0A2020202020207D293B0D0A20202020202069662028746869732E6F7074696F6E732E696E697446'; +wwv_flow_api.g_varchar2_table(201) := '6E29207B0D0A2020202020202020617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64652E2E2E22293B0D0A20202020202020202F2F696E736964652074686520696E697428292066756E6374696F6E2077'; +wwv_flow_api.g_varchar2_table(202) := '652077616E742022746869732220746F20726566657220746F20746869730D0A2020202020202020746869732E696E69743D746869732E6F7074696F6E732E696E6974466E3B0D0A2020202020202020746869732E696E697428293B0D0A202020202020'; +wwv_flow_api.g_varchar2_table(203) := '7D0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A2020202020202020746869732E7265667265736828293B0D0A2020202020207D0D0A202020202020617065782E6A5175657279282223222B746869'; +wwv_flow_api.g_varchar2_table(204) := '732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C207B6D61703A746869732E6D61707D293B0D0A202020202020617065782E646562756728227265706F72746D61702E696E69742066696E6973686564'; +wwv_flow_api.g_varchar2_table(205) := '22293B0D0A202020207D2C0D0A202020200D0A202020202F2F2043616C6C6564207768656E20637265617465642C20616E64206C61746572207768656E206368616E67696E67206F7074696F6E730D0A20202020726566726573683A2066756E6374696F'; +wwv_flow_api.g_varchar2_table(206) := '6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E7265667265736822293B0D0A202020202020746869732E5F686964654D65737361676528293B0D0A20202020202069662028746869732E6F7074696F6E732E6578'; +wwv_flow_api.g_varchar2_table(207) := '706563744461746129207B0D0A2020202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B0D0A202020202020202076'; +wwv_flow_api.g_varchar2_table(208) := '6172205F74686973203D20746869733B0D0A2020202020202020617065782E7365727665722E706C7567696E0D0A2020202020202020202028746869732E6F7074696F6E732E616A61784964656E7469666965720D0A202020202020202020202C7B2070'; +wwv_flow_api.g_varchar2_table(209) := '6167654974656D733A20746869732E6F7074696F6E732E616A61784974656D73207D0D0A202020202020202020202C7B2064617461547970653A20226A736F6E220D0A2020202020202020202020202C737563636573733A2066756E6374696F6E282070'; +wwv_flow_api.g_varchar2_table(210) := '446174612029207B0D0A2020202020202020202020202020617065782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E676966792870446174612E736F75746877657374292B22206E6F727468656173743D'; +wwv_flow_api.g_varchar2_table(211) := '222B4A534F4E2E737472696E676966792870446174612E6E6F7274686561737429293B0D0A20202020202020202020202020205F746869732E6D61702E666974426F756E6473280D0A202020202020202020202020202020207B736F7574683A70446174'; +wwv_flow_api.g_varchar2_table(212) := '612E736F757468776573742E6C61740D0A202020202020202020202020202020202C776573743A2070446174612E736F757468776573742E6C6E670D0A202020202020202020202020202020202C6E6F7274683A70446174612E6E6F727468656173742E'; +wwv_flow_api.g_varchar2_table(213) := '6C61740D0A202020202020202020202020202020202C656173743A2070446174612E6E6F727468656173742E6C6E677D293B0D0A2020202020202020202020202020696620285F746869732E696E666F57696E646F7729207B0D0A202020202020202020'; +wwv_flow_api.g_varchar2_table(214) := '202020202020205F746869732E696E666F57696E646F772E636C6F736528293B0D0A20202020202020202020202020207D0D0A2020202020202020202020202020617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B'; +wwv_flow_api.g_varchar2_table(215) := '70446174612E6D6170646174612E6C656E677468293B0D0A20202020202020202020202020205F746869732E5F72656D6F76654D61726B65727328293B0D0A20202020202020202020202020206966202870446174612E6D61706461746129207B0D0A20'; +wwv_flow_api.g_varchar2_table(216) := '2020202020202020202020202020205F746869732E5F73686F77446174612870446174612E6D617064617461293B0D0A20202020202020202020202020202020696620285F746869732E6F7074696F6E732E76697375616C69736174696F6E3D3D226469'; +wwv_flow_api.g_varchar2_table(217) := '72656374696F6E732229207B0D0A2020202020202020202020202020202020205F746869732E5F646972656374696F6E732870446174612E6D617064617461293B0D0A202020202020202020202020202020207D0D0A2020202020202020202020202020'; +wwv_flow_api.g_varchar2_table(218) := '7D0D0A2020202020202020202020202020617065782E6A5175657279282223222B5F746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822293B0D0A2020202020202020202020207D'; +wwv_flow_api.g_varchar2_table(219) := '0D0A202020202020202020207D20293B0D0A2020202020207D0D0A202020202020617065782E646562756728227265706F72746D61702E726566726573682066696E697368656422293B0D0A2020202020202F2F205472696767657220612063616C6C62'; +wwv_flow_api.g_varchar2_table(220) := '61636B2F6576656E740D0A202020202020746869732E5F747269676765722820226368616E67652220293B0D0A202020207D2C0D0A0D0A202020202F2F204576656E747320626F756E6420766961205F6F6E206172652072656D6F766564206175746F6D'; +wwv_flow_api.g_varchar2_table(221) := '61746963616C6C790D0A202020202F2F20726576657274206F74686572206D6F64696669636174696F6E7320686572650D0A202020205F64657374726F793A2066756E6374696F6E2829207B0D0A2020202020202F2F2072656D6F76652067656E657261'; +wwv_flow_api.g_varchar2_table(222) := '74656420656C656D656E74730D0A20202020202069662028746869732E686561746D61704C6179657229207B20746869732E686561746D61704C617965722E72656D6F766528293B207D0D0A20202020202069662028746869732E7573657270696E2920'; +wwv_flow_api.g_varchar2_table(223) := '7B2064656C65746520746869732E7573657270696E3B207D0D0A20202020202069662028746869732E646972656374696F6E73446973706C617929207B2064656C65746520746869732E646972656374696F6E73446973706C61793B207D0D0A20202020'; +wwv_flow_api.g_varchar2_table(224) := '202069662028746869732E646972656374696F6E735365727669636529207B2064656C65746520746869732E646972656374696F6E73536572766963653B207D0D0A202020202020746869732E5F72656D6F76654D61726B65727328293B0D0A20202020'; +wwv_flow_api.g_varchar2_table(225) := '2020746869732E5F686964654D65737361676528293B0D0A202020202020746869732E6D61702E72656D6F766528293B0D0A202020207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E732069732063616C6C6564207769746820612068617368'; +wwv_flow_api.g_varchar2_table(226) := '206F6620616C6C206F7074696F6E73207468617420617265206368616E67696E670D0A202020202F2F20616C776179732072656672657368207768656E206368616E67696E67206F7074696F6E730D0A202020205F7365744F7074696F6E733A2066756E'; +wwv_flow_api.g_varchar2_table(227) := '6374696F6E2829207B0D0A2020202020202F2F205F737570657220616E64205F73757065724170706C792068616E646C65206B656570696E672074686520726967687420746869732D636F6E746578740D0A202020202020746869732E5F737570657241'; +wwv_flow_api.g_varchar2_table(228) := '70706C792820617267756D656E747320293B0D0A202020202020746869732E7265667265736828293B0D0A202020207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E2069732063616C6C656420666F72206561636820696E646976696475616C'; +wwv_flow_api.g_varchar2_table(229) := '206F7074696F6E2074686174206973206368616E67696E670D0A202020205F7365744F7074696F6E3A2066756E6374696F6E28206B65792C2076616C75652029207B0D0A202020202020746869732E5F737570657228206B65792C2076616C756520293B'; +wwv_flow_api.g_varchar2_table(230) := '0D0A202020207D2020202020200D0A0D0A20207D293B0D0A7D293B'; null; end; / @@ -12812,34 +12829,35 @@ wwv_flow_api.g_varchar2_table(89) := '696F6E73536572766963652E726F757465287B6F72 wwv_flow_api.g_varchar2_table(90) := '74732C74726176656C4D6F64653A676F6F676C652E6D6170732E54726176656C4D6F64655B746869732E6F7074696F6E732E74726176656C4D6F64655D7D2C66756E6374696F6E28652C74297B6E2E5F646972656374696F6E73526573706F6E73652865'; wwv_flow_api.g_varchar2_table(91) := '2C74297D297D656C736520617065782E646562756728226E6F7420656E6F75676820776179706F696E7473202D206E656564206174206C6561737420616E206F726967696E20616E6420612064657374696E6174696F6E20706F696E7422297D2C5F6372'; wwv_flow_api.g_varchar2_table(92) := '656174653A66756E6374696F6E28297B617065782E646562756728227265706F72746D61702E5F63726561746520222B746869732E656C656D656E742E70726F70282269642229292C617065782E646562756728226F7074696F6E733A20222B4A534F4E'; -wwv_flow_api.g_varchar2_table(93) := '2E737472696E6769667928746869732E6F7074696F6E7329293B76617220653D77696E646F772E6C6F636174696F6E2E6F726967696E2B77696E646F772E6C6F636174696F6E2E706174686E616D653B653D652E737562737472696E6728302C652E6C61'; -wwv_flow_api.g_varchar2_table(94) := '7374496E6465784F6628222F2229292C746869732E696D6167655072656669783D652B222F222B746869732E6F7074696F6E732E706C7567696E46696C655072656669782B22696D616765732F6D222C617065782E64656275672827746869732E696D61'; -wwv_flow_api.g_varchar2_table(95) := '67655072656669783D22272B746869732E696D6167655072656669782B272227293B76617220743D7B6D696E5A6F6F6D3A746869732E6F7074696F6E732E6D696E5A6F6F6D2C6D61785A6F6F6D3A746869732E6F7074696F6E732E6D61785A6F6F6D2C7A'; -wwv_flow_api.g_varchar2_table(96) := '6F6F6D3A746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C63656E7465723A746869732E6F7074696F6E732E696E697469616C43656E7465722C6D61705479706549643A746869732E6F7074696F6E732E6D6170547970652C647261676761'; -wwv_flow_api.g_varchar2_table(97) := '626C653A746869732E6F7074696F6E732E616C6C6F7750616E2C7A6F6F6D436F6E74726F6C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C7363726F6C6C776865656C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C64697361'; -wwv_flow_api.g_varchar2_table(98) := '626C65446F75626C65436C69636B5A6F6F6D3A21746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C6765737475726548616E646C696E673A746869732E6F7074696F6E732E6765737475726548616E646C696E677D3B746869732E6F7074696F6E'; -wwv_flow_api.g_varchar2_table(99) := '732E6D61705374796C65262628742E7374796C65733D746869732E6F7074696F6E732E6D61705374796C65292C746869732E6D61703D6E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E7442794964287468'; -wwv_flow_api.g_varchar2_table(100) := '69732E656C656D656E742E70726F70282269642229292C74292C746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F727468656173742626746869732E6D61702E666974426F756E6473286E657720676F6F'; -wwv_flow_api.g_varchar2_table(101) := '676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B76617220693D746869733B676F6F676C652E6D6170732E6576656E742E61'; -wwv_flow_api.g_varchar2_table(102) := '64644C697374656E657228746869732E6D61702C22636C69636B222C66756E6374696F6E2865297B617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E6769667928652E6C61744C6E6729292C692E6F7074696F6E'; -wwv_flow_api.g_varchar2_table(103) := '732E636C69636B5A6F6F6D4C6576656C262628617065782E6465627567282270616E2B7A6F6F6D22292C692E6F7074696F6E732E70616E4F6E436C69636B2626692E6D61702E70616E546F28652E6C61744C6E67292C692E6D61702E7365745A6F6F6D28'; -wwv_flow_api.g_varchar2_table(104) := '692E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C29292C617065782E6A5175657279282223222B692E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C7B6D61703A692E6D61702C6C61743A652E6C'; -wwv_flow_api.g_varchar2_table(105) := '61744C6E672E6C617428292C6C6E673A652E6C61744C6E672E6C6E6728297D297D292C746869732E6F7074696F6E732E696E6974466E262628617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64652E2E2E'; -wwv_flow_api.g_varchar2_table(106) := '22292C746869732E696E69743D746869732E6F7074696F6E732E696E6974466E2C746869732E696E69742829292C746869732E6F7074696F6E732E657870656374446174612626746869732E7265667265736828292C617065782E6A5175657279282223'; -wwv_flow_api.g_varchar2_table(107) := '222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C7B6D61703A746869732E6D61707D292C617065782E646562756728227265706F72746D61702E696E69742066696E697368656422297D2C'; -wwv_flow_api.g_varchar2_table(108) := '726566726573683A66756E6374696F6E28297B696628617065782E646562756728227265706F72746D61702E7265667265736822292C746869732E5F686964654D65737361676528292C746869732E6F7074696F6E732E65787065637444617461297B61'; -wwv_flow_api.g_varchar2_table(109) := '7065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B76617220653D746869733B617065782E7365727665722E706C7567696E28746869'; -wwv_flow_api.g_varchar2_table(110) := '732E6F7074696F6E732E616A61784964656E7469666965722C7B706167654974656D733A746869732E6F7074696F6E732E616A61784974656D737D2C7B64617461547970653A226A736F6E222C737563636573733A66756E6374696F6E2874297B617065'; -wwv_flow_api.g_varchar2_table(111) := '782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E6769667928742E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E6769667928742E6E6F7274686561737429292C'; -wwv_flow_api.g_varchar2_table(112) := '652E6D61702E666974426F756E6473287B736F7574683A742E736F757468776573742E6C61742C776573743A742E736F757468776573742E6C6E672C6E6F7274683A742E6E6F727468656173742E6C61742C656173743A742E6E6F727468656173742E6C'; -wwv_flow_api.g_varchar2_table(113) := '6E677D292C652E696E666F57696E646F772626652E696E666F57696E646F772E636C6F736528292C617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B742E6D6170646174612E6C656E677468292C652E5F72656D6F'; -wwv_flow_api.g_varchar2_table(114) := '76654D61726B65727328292C742E6D617064617461262628652E5F73686F774461746128742E6D617064617461292C22646972656374696F6E73223D3D652E6F7074696F6E732E76697375616C69736174696F6E2626652E5F646972656374696F6E7328'; -wwv_flow_api.g_varchar2_table(115) := '742E6D61706461746129292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822297D7D297D617065782E646562756728227265706F72746D6170'; -wwv_flow_api.g_varchar2_table(116) := '2E726566726573682066696E697368656422292C746869732E5F7472696767657228226368616E676522297D2C5F64657374726F793A66756E6374696F6E28297B746869732E686561746D61704C617965722626746869732E686561746D61704C617965'; -wwv_flow_api.g_varchar2_table(117) := '722E72656D6F766528292C746869732E7573657270696E262664656C65746520746869732E7573657270696E2C746869732E646972656374696F6E73446973706C6179262664656C65746520746869732E646972656374696F6E73446973706C61792C74'; -wwv_flow_api.g_varchar2_table(118) := '6869732E646972656374696F6E7353657276696365262664656C65746520746869732E646972656374696F6E73536572766963652C746869732E5F72656D6F76654D61726B65727328292C746869732E5F686964654D65737361676528292C746869732E'; -wwv_flow_api.g_varchar2_table(119) := '6D61702E72656D6F766528297D2C5F7365744F7074696F6E733A66756E6374696F6E28297B746869732E5F73757065724170706C7928617267756D656E7473292C746869732E7265667265736828297D2C5F7365744F7074696F6E3A66756E6374696F6E'; -wwv_flow_api.g_varchar2_table(120) := '28652C74297B746869732E5F737570657228652C74297D7D297D293B'; +wwv_flow_api.g_varchar2_table(93) := '2E737472696E6769667928746869732E6F7074696F6E7329293B76617220653D746869732C743D77696E646F772E6C6F636174696F6E2E6F726967696E2B77696E646F772E6C6F636174696F6E2E706174686E616D653B743D742E737562737472696E67'; +wwv_flow_api.g_varchar2_table(94) := '28302C742E6C617374496E6465784F6628222F2229292C746869732E696D6167655072656669783D742B222F222B746869732E6F7074696F6E732E706C7567696E46696C655072656669782B22696D616765732F6D222C617065782E6465627567282774'; +wwv_flow_api.g_varchar2_table(95) := '6869732E696D6167655072656669783D22272B746869732E696D6167655072656669782B272227293B76617220693D7B6D696E5A6F6F6D3A746869732E6F7074696F6E732E6D696E5A6F6F6D2C6D61785A6F6F6D3A746869732E6F7074696F6E732E6D61'; +wwv_flow_api.g_varchar2_table(96) := '785A6F6F6D2C7A6F6F6D3A746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C63656E7465723A746869732E6F7074696F6E732E696E697469616C43656E7465722C6D61705479706549643A746869732E6F7074696F6E732E6D617054797065'; +wwv_flow_api.g_varchar2_table(97) := '2C647261676761626C653A746869732E6F7074696F6E732E616C6C6F7750616E2C7A6F6F6D436F6E74726F6C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C7363726F6C6C776865656C3A746869732E6F7074696F6E732E616C6C6F775A6F'; +wwv_flow_api.g_varchar2_table(98) := '6F6D2C64697361626C65446F75626C65436C69636B5A6F6F6D3A21746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C6765737475726548616E646C696E673A746869732E6F7074696F6E732E6765737475726548616E646C696E677D3B74686973'; +wwv_flow_api.g_varchar2_table(99) := '2E6F7074696F6E732E6D61705374796C65262628692E7374796C65733D746869732E6F7074696F6E732E6D61705374796C65292C746869732E6D61703D6E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E74'; +wwv_flow_api.g_varchar2_table(100) := '4279496428746869732E656C656D656E742E70726F70282269642229292C69292C746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F727468656173742626746869732E6D61702E666974426F756E647328'; +wwv_flow_api.g_varchar2_table(101) := '6E657720676F6F676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429292C676F6F676C652E6D6170732E6576656E742E6164644C69'; +wwv_flow_api.g_varchar2_table(102) := '7374656E657228746869732E6D61702C22636C69636B222C66756E6374696F6E2874297B617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E6769667928742E6C61744C6E6729292C652E6F7074696F6E732E636C'; +wwv_flow_api.g_varchar2_table(103) := '69636B5A6F6F6D4C6576656C262628617065782E6465627567282270616E2B7A6F6F6D22292C652E6F7074696F6E732E70616E4F6E436C69636B2626652E6D61702E70616E546F28742E6C61744C6E67292C652E6D61702E7365745A6F6F6D28652E6F70'; +wwv_flow_api.g_varchar2_table(104) := '74696F6E732E636C69636B5A6F6F6D4C6576656C29292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C7B6D61703A652E6D61702C6C61743A742E6C61744C6E'; +wwv_flow_api.g_varchar2_table(105) := '672E6C617428292C6C6E673A742E6C61744C6E672E6C6E6728297D297D292C617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E62696E6428226170657872656672657368222C66756E6374696F6E28297B'; +wwv_flow_api.g_varchar2_table(106) := '242822236D61705F222B652E6F7074696F6E732E726567696F6E4964292E7265706F72746D617028227265667265736822297D292C746869732E6F7074696F6E732E696E6974466E262628617065782E6465627567282272756E6E696E6720696E69745F'; +wwv_flow_api.g_varchar2_table(107) := '6A6176617363726970745F636F64652E2E2E22292C746869732E696E69743D746869732E6F7074696F6E732E696E6974466E2C746869732E696E69742829292C746869732E6F7074696F6E732E657870656374446174612626746869732E726566726573'; +wwv_flow_api.g_varchar2_table(108) := '6828292C617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C7B6D61703A746869732E6D61707D292C617065782E646562756728227265706F72746D6170'; +wwv_flow_api.g_varchar2_table(109) := '2E696E69742066696E697368656422297D2C726566726573683A66756E6374696F6E28297B696628617065782E646562756728227265706F72746D61702E7265667265736822292C746869732E5F686964654D65737361676528292C746869732E6F7074'; +wwv_flow_api.g_varchar2_table(110) := '696F6E732E65787065637444617461297B617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B76617220653D746869733B61706578'; +wwv_flow_api.g_varchar2_table(111) := '2E7365727665722E706C7567696E28746869732E6F7074696F6E732E616A61784964656E7469666965722C7B706167654974656D733A746869732E6F7074696F6E732E616A61784974656D737D2C7B64617461547970653A226A736F6E222C7375636365'; +wwv_flow_api.g_varchar2_table(112) := '73733A66756E6374696F6E2874297B617065782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E6769667928742E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E67'; +wwv_flow_api.g_varchar2_table(113) := '69667928742E6E6F7274686561737429292C652E6D61702E666974426F756E6473287B736F7574683A742E736F757468776573742E6C61742C776573743A742E736F757468776573742E6C6E672C6E6F7274683A742E6E6F727468656173742E6C61742C'; +wwv_flow_api.g_varchar2_table(114) := '656173743A742E6E6F727468656173742E6C6E677D292C652E696E666F57696E646F772626652E696E666F57696E646F772E636C6F736528292C617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B742E6D61706461'; +wwv_flow_api.g_varchar2_table(115) := '74612E6C656E677468292C652E5F72656D6F76654D61726B65727328292C742E6D617064617461262628652E5F73686F774461746128742E6D617064617461292C22646972656374696F6E73223D3D652E6F7074696F6E732E76697375616C6973617469'; +wwv_flow_api.g_varchar2_table(116) := '6F6E2626652E5F646972656374696F6E7328742E6D61706461746129292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822297D7D297D617065'; +wwv_flow_api.g_varchar2_table(117) := '782E646562756728227265706F72746D61702E726566726573682066696E697368656422292C746869732E5F7472696767657228226368616E676522297D2C5F64657374726F793A66756E6374696F6E28297B746869732E686561746D61704C61796572'; +wwv_flow_api.g_varchar2_table(118) := '2626746869732E686561746D61704C617965722E72656D6F766528292C746869732E7573657270696E262664656C65746520746869732E7573657270696E2C746869732E646972656374696F6E73446973706C6179262664656C65746520746869732E64'; +wwv_flow_api.g_varchar2_table(119) := '6972656374696F6E73446973706C61792C746869732E646972656374696F6E7353657276696365262664656C65746520746869732E646972656374696F6E73536572766963652C746869732E5F72656D6F76654D61726B65727328292C746869732E5F68'; +wwv_flow_api.g_varchar2_table(120) := '6964654D65737361676528292C746869732E6D61702E72656D6F766528297D2C5F7365744F7074696F6E733A66756E6374696F6E28297B746869732E5F73757065724170706C7928617267756D656E7473292C746869732E7265667265736828297D2C5F'; +wwv_flow_api.g_varchar2_table(121) := '7365744F7074696F6E3A66756E6374696F6E28652C74297B746869732E5F737570657228652C74297D7D297D293B'; null; end; / @@ -12921,7 +12939,7 @@ wwv_flow_api.create_page( '

', 'This page only uses declarative APEX features (no added javascript).')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721154410' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(73507635119238450) @@ -13136,7 +13154,7 @@ wwv_flow_api.create_page( '

', 'Dynamic action on click of the Refresh button does an ordinary Refresh action on the region. This reloads the data for the map and shows the pins on the map.')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721231641' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32939239851408724) @@ -13305,7 +13323,7 @@ wwv_flow_api.create_page( '

', 'Map Style: "Bojangles"')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32940867019408740) @@ -13474,7 +13492,7 @@ wwv_flow_api.create_page( '

', 'Dynamic action on plugin event markerClick sets P1_CLICKED.')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721154530' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32939470180408726) @@ -13674,7 +13692,7 @@ wwv_flow_api.create_page( 'This demonstrates how to modify one of the plugin options at runtime, how to convert a string to a Google Maps LatLng object, and how to execute arbitrary Google Maps API calls.', '

')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721154705' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(22167236053368435) @@ -13944,15 +13962,15 @@ wwv_flow_api.create_page( '

', 'Query for map plugin:', '', -' select round(lat,4), round(lng,4), sum(mag+1)', +' select round(lat,3), round(lng,3), sum(10*(mag+1))', ' from earthquakes', ' where mag+1>=0', -' group by round(lat,4), round(lng,4)', +' group by round(lat,3), round(lng,3)', '', '

', 'Adding the SUM() and GROUP BY helps to reduce the volume of data sent to the client. For a heatmap, sending 5 rows with the same position and weight "1" is the same as sending a single row with weight "5".')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721234546' +,p_last_upd_yyyymmddhh24miss=>'20190722202638' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(86703429402923302) @@ -13988,7 +14006,7 @@ wwv_flow_api.create_page_plug( ,p_plug_display_point=>'BODY' ,p_plug_item_display_point=>'BELOW' ,p_query_type=>'SQL' -,p_plug_source=>'select round(lat,4), round(lng,4), sum(mag+1) from earthquakes where mag+1>=0 group by round(lat,4), round(lng,4)' +,p_plug_source=>'select round(lat,3), round(lng,3), sum(10*(mag+1)) from earthquakes where mag+1>=0 group by round(lat,3), round(lng,3)' ,p_plug_source_type=>'PLUGIN_COM.JK64.REPORT_GOOGLE_MAP_R1' ,p_plug_query_options=>'DERIVED_REPORT_COLUMNS' ,p_attribute_01=>'400' @@ -14002,9 +14020,8 @@ wwv_flow_api.create_page_plug( ||'uration":36},{"color":"#333333"},{"lightness":40}]},{"elementType":"labels.icon","stylers":[{"visibility":"off"}]},{"featureType":"transit","elementType":"geometry","stylers":[{"color":"#f2f2f2"},{"lightness":19}]},{"featureType":"administrative","el' ||'ementType":"geometry.fill","stylers":[{"color":"#fefefe"},{"lightness":20}]},{"featureType":"administrative","elementType":"geometry.stroke","stylers":[{"color":"#fefefe"},{"lightness":17},{"weight":1.2}]}]' ,p_attribute_12=>'N' -,p_attribute_13=>'0.6' -,p_attribute_14=>'5' -,p_attribute_21=>'N' +,p_attribute_13=>'0.7' +,p_attribute_14=>'10' ,p_attribute_22=>'ROADMAP' ,p_attribute_24=>'Y' ,p_attribute_25=>'auto' @@ -14021,7 +14038,7 @@ wwv_flow_api.create_report_region( ,p_display_point=>'BODY' ,p_source_type=>'NATIVE_SQL_REPORT' ,p_query_type=>'SQL' -,p_source=>'select round(lat,4), round(lng,4), sum(mag+1) from earthquakes where mag+1>=0 group by round(lat,4), round(lng,4)' +,p_source=>'select round(lat,3), round(lng,3), sum(10*(mag+1)) from earthquakes where mag+1>=0 group by round(lat,3), round(lng,3)' ,p_ajax_enabled=>'Y' ,p_query_row_template=>wwv_flow_api.id(25186286576607505432) ,p_query_num_rows=>15 @@ -14035,33 +14052,33 @@ wwv_flow_api.create_report_region( ,p_plug_query_strip_html=>'N' ); wwv_flow_api.create_report_columns( - p_id=>wwv_flow_api.id(33393523911218435) + p_id=>wwv_flow_api.id(33393896629218438) ,p_query_column_id=>1 -,p_column_alias=>'ROUND(LAT,4)' +,p_column_alias=>'ROUND(LAT,3)' ,p_column_display_sequence=>1 -,p_column_heading=>'Round(lat,4)' +,p_column_heading=>'Round(lat,3)' ,p_use_as_row_header=>'N' ,p_disable_sort_column=>'N' ,p_derived_column=>'N' ,p_include_in_export=>'Y' ); wwv_flow_api.create_report_columns( - p_id=>wwv_flow_api.id(33393624991218436) + p_id=>wwv_flow_api.id(33393924751218439) ,p_query_column_id=>2 -,p_column_alias=>'ROUND(LNG,4)' +,p_column_alias=>'ROUND(LNG,3)' ,p_column_display_sequence=>2 -,p_column_heading=>'Round(lng,4)' +,p_column_heading=>'Round(lng,3)' ,p_use_as_row_header=>'N' ,p_disable_sort_column=>'N' ,p_derived_column=>'N' ,p_include_in_export=>'Y' ); wwv_flow_api.create_report_columns( - p_id=>wwv_flow_api.id(33393769895218437) + p_id=>wwv_flow_api.id(33394094415218440) ,p_query_column_id=>3 -,p_column_alias=>'SUM(MAG+1)' +,p_column_alias=>'SUM(10*(MAG+1))' ,p_column_display_sequence=>3 -,p_column_heading=>'Sum(mag+1)' +,p_column_heading=>'Sum(10*(mag+1))' ,p_use_as_row_header=>'N' ,p_disable_sort_column=>'N' ,p_derived_column=>'N' @@ -14110,7 +14127,7 @@ wwv_flow_api.create_page( ' }', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721154910' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32938840967408720) @@ -14390,7 +14407,7 @@ wwv_flow_api.create_page( ' where collection_name = ''MAP''', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(66183243515380734) @@ -14543,7 +14560,7 @@ wwv_flow_api.create_page( ,p_page_template_options=>'#DEFAULT#' ,p_help_text=>'No help is available for this page.' ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32937906099408711) @@ -14624,7 +14641,7 @@ wwv_flow_api.create_page( ' where collection_name = ''MAP''', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32938674169408718) @@ -14787,7 +14804,7 @@ wwv_flow_api.create_page( ' $s("P11_LEGS",this.data.legs);', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(22167390620368436) @@ -15096,7 +15113,7 @@ wwv_flow_api.create_page( '

', 'Tip: Zoom to user''s current location')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721155049' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32939196388408723) @@ -15237,7 +15254,7 @@ wwv_flow_api.create_page( '', 'It will run once on page load, after the google maps object has been created but before the data is loaded into the map.')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32939684191408728) @@ -15303,7 +15320,7 @@ wwv_flow_api.create_page( 'The query does not include the "info" column, which means the pins don''t show any info window on click. If an "info" column had been provided, clicking a pin would show the info window; if the info window is too close to the edge, the map would pan a' ||' bit to move it into range.')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721212043' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32939858902408730) @@ -15325,6 +15342,8 @@ wwv_flow_api.create_page_plug( ,p_plug_query_options=>'DERIVED_REPORT_COLUMNS' ,p_attribute_01=>'350' ,p_attribute_02=>'PINS' +,p_attribute_12=>'N' +,p_attribute_21=>'N' ,p_attribute_22=>'ROADMAP' ,p_attribute_24=>'Y' ,p_attribute_25=>'auto' @@ -15371,7 +15390,7 @@ wwv_flow_api.create_page( ' pano.setVisible(true);', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(32940304653408735) @@ -15590,7 +15609,7 @@ wwv_flow_api.create_page( ' where collection_name = ''MAP''', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190720190800' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(99447872302700825) @@ -15763,7 +15782,7 @@ wwv_flow_api.create_page( ' + " this.data.attr03=" + this.data.attr03', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721212132' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(106892920984447966) @@ -15994,7 +16013,7 @@ wwv_flow_api.create_page( ' lyr.setMap( $("#map_mymap").reportmap("instance").map );', '')) ,p_last_updated_by=>'JEFF' -,p_last_upd_yyyymmddhh24miss=>'20190721155310' +,p_last_upd_yyyymmddhh24miss=>'20190722170920' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(33391994028218419) @@ -16023,6 +16042,8 @@ wwv_flow_api.create_page_plug( ,p_attribute_04=>'PAN_ON_CLICK:PAN_ALLOWED:ZOOM_ALLOWED' ,p_attribute_05=>'11' ,p_attribute_06=>'40.710,-73.984' +,p_attribute_12=>'N' +,p_attribute_21=>'N' ,p_attribute_22=>'ROADMAP' ,p_attribute_24=>'Y' ,p_attribute_25=>'auto' diff --git a/region_type_plugin_com_jk64_report_google_map_r1.sql b/region_type_plugin_com_jk64_report_google_map_r1.sql index f09671c..36ea70d 100644 --- a/region_type_plugin_com_jk64_report_google_map_r1.sql +++ b/region_type_plugin_com_jk64_report_google_map_r1.sql @@ -105,7 +105,7 @@ wwv_flow_api.create_plugin( 'end latlng_literal;', '', 'procedure parse_latlng (p_val in varchar2, p_label in varchar2, p_lat out number, p_lng out number) is', -' delim_pos varchar2(1);', +' delim_pos number;', 'begin', ' -- allow space as the delimiter; this should be used in locales which use comma (,) as decimal separator', ' if instr(trim(p_val),'' '') > 0 then', @@ -117,6 +117,30 @@ wwv_flow_api.create_plugin( ' p_lng := apex_plugin_util.get_attribute_as_number(substr(p_val,delim_pos+1), p_label || '' longitude'');', 'end parse_latlng;', '', +'function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is', +' n number;', +'begin', +' n := apex_plugin_util.get_attribute_as_number(p_attr, p_label);', +' if not n between 0 and 23 then', +' raise_application_error(-20000, p_label || '': must be in range 0..23 ("'' || p_attr || ''")'');', +' end if;', +' return n;', +'end valid_zoom_level;', +'', +'procedure get_lat_lng_attr', +' (lat_val in varchar2', +' ,lng_val in varchar2', +' ,record_no in number', +' ,p_lat out number', +' ,p_lng out number', +' ) is', +'begin', +' p_lat := round(apex_plugin_util.get_attribute_as_number(lat_val,''Latitude (#''||record_no||'')'')', +' ,g_coord_precision);', +' p_lng := round(apex_plugin_util.get_attribute_as_number(lng_val,''Longitude (#''||record_no||'')'')', +' ,g_coord_precision);', +'end get_lat_lng_attr;', +'', 'function get_markers', ' (p_plugin in apex_plugin.t_plugin', ' ,p_region in apex_plugin.t_region', @@ -136,7 +160,7 @@ wwv_flow_api.create_plugin( ' l_max_rows number; --p_plugin.attribute_07;', ' l_visualisation plugin_attr := p_region.attribute_02;', ' l_escape_special_chars plugin_attr := p_region.attribute_24;', -' ', +'', ' function flex_field (attr_no in number, i in number) return varchar2 is', ' d varchar2(4000);', ' begin', @@ -148,7 +172,7 @@ wwv_flow_api.create_plugin( ' end if;', ' return apex_javascript.add_attribute(''a''||attr_no,d);', ' end flex_field;', -' ', +' ', ' function varchar2_field (attr_no in number, i in number) return varchar2 is', ' r varchar2(4000);', ' begin', @@ -157,7 +181,7 @@ wwv_flow_api.create_plugin( ' end if;', ' return r;', ' end varchar2_field;', -'', +' ', 'begin', '', ' /*', @@ -193,13 +217,18 @@ wwv_flow_api.create_plugin( ' ', ' for i in 1..l_column_value_list(1).count loop', ' ', -' l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),''Latitude (#''||i||'')''),g_coord_precision);', -' l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),''Longitude (#''||i||'')''),g_coord_precision);', +' get_lat_lng_attr', +' (lat_val => l_column_value_list(1)(i)', +' ,lng_val => l_column_value_list(2)(i)', +' ,record_no => i', +' ,p_lat => l_lat', +' ,p_lng => l_lng);', +'', ' l_weight := nvl(round(', ' apex_plugin_util.get_attribute_as_number(l_column_value_list(3)(i),''Weight (#''||i||'')'')', ' ),1);', ' ', -' -- minimise size of data to be sent', +' -- minimise size of data to be sent by encoding it as an array of arrays', ' l_buf := ''['' || to_char(l_lat,g_tochar_format)', ' || '','' || to_char(l_lng,g_tochar_format)', ' || '','' || to_char(greatest(l_weight,1))', @@ -231,8 +260,12 @@ wwv_flow_api.create_plugin( ' ', ' for i in 1..l_column_value_list(1).count loop', '', -' l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),''Latitude (#''||i||'')''),g_coord_precision);', -' l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),''Longitude (#''||i||'')''),g_coord_precision);', +' get_lat_lng_attr', +' (lat_val => l_column_value_list(1)(i)', +' ,lng_val => l_column_value_list(2)(i)', +' ,record_no => i', +' ,p_lat => l_lat', +' ,p_lng => l_lng);', ' ', ' -- get flex fields, if any', ' l_flex := null;', @@ -322,18 +355,7 @@ wwv_flow_api.create_plugin( ' l_gesture_handling plugin_attr := p_region.attribute_25;', ' ', ' l_opt varchar2(32767);', -' l_buf varchar2(32767);', ' ', -' function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is', -' n number;', -' begin', -' n := apex_plugin_util.get_attribute_as_number(p_attr, p_label);', -' if not n between 0 and 23 then', -' raise_application_error(-20000, p_label || '': must be in range 0..23 ("'' || p_attr || ''")'');', -' end if;', -' return n;', -' end valid_zoom_level;', -'', 'begin', ' -- debug information will be included', ' if apex_application.g_debug then', @@ -347,13 +369,6 @@ wwv_flow_api.create_plugin( ' raise_application_error(-20000, ''Google Maps API Key is required (set in Component Settings)'');', ' end if;', ' ', -' l_min_zoom := valid_zoom_level(p_plugin.attribute_05, ''Min. Zoom'');', -' l_max_zoom := valid_zoom_level(p_plugin.attribute_06, ''Max. Zoom'');', -' l_click_zoom_level := valid_zoom_level(p_region.attribute_03, ''Zoom Level on Click'');', -' l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, ''Initial Zoom Level'');', -' l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, ''Heatmap Opacity'');', -' l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, ''Heatmap Radius'');', -' ', ' apex_javascript.add_library', ' (p_name => ''js?key='' || l_api_key', ' || case when l_visualisation = g_visualisation_heatmap then', @@ -380,11 +395,19 @@ wwv_flow_api.create_plugin( ' else ''R''||p_region.id', ' end;', ' apex_debug.message(''map region: '' || l_region_id);', +'', +' l_min_zoom := valid_zoom_level(p_plugin.attribute_05, ''Min. Zoom'');', +' l_max_zoom := valid_zoom_level(p_plugin.attribute_06, ''Max. Zoom'');', +' l_click_zoom_level := valid_zoom_level(p_region.attribute_03, ''Zoom Level on Click'');', +' l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, ''Initial Zoom Level'');', +' l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, ''Heatmap Opacity'');', +' l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, ''Heatmap Radius'');', ' ', ' if l_initial_center is not null then', ' parse_latlng(l_initial_center, p_label=>''Initial Map Center'', p_lat=>l_lat, p_lng=>l_lng);', ' end if;', ' ', +' -- use nullif to convert default values to null; this reduces the footprint of the generated code', ' l_opt := ''{''', ' || apex_javascript.add_attribute(''regionId'', l_region_id)', ' || apex_javascript.add_attribute(''expectData'', nullif(p_region.source is not null,true))', @@ -432,22 +455,14 @@ wwv_flow_api.create_plugin( ' || apex_javascript.add_attribute(''pluginFilePrefix'', p_plugin.file_prefix', ' ,false,false)', ' || ''}'';', -' ', -' -- we don''t want the initialisation to run until after the page is loaded including all resources; the r_ function', -' -- method here waits until the document is ready before running the jquery plugin initialisation', -' l_buf := ''', -'', -'

'';', -' ', -' sys.htp.p(replace(l_buf,''#REGION_ID#'',l_region_id));', +'', +' apex_debug.message(''map options: '' || l_opt);', +' ', +' apex_javascript.add_onload_code(p_code =>', +' ''$("#map_'' || l_region_id || ''").reportmap('' || l_opt || '');''', +' );', +' ', +' sys.htp.p(''
'');', ' ', ' return l_result;', 'exception', @@ -559,7 +574,7 @@ wwv_flow_api.create_plugin( 'https://github.com/jeffreykemp/jk64-plugin-reportmap/wiki')) ,p_version_identifier=>'1.0.1' ,p_about_url=>'https://jeffreykemp.github.io/jk64-plugin-reportmap/' -,p_files_version=>242 +,p_files_version=>246 ); wwv_flow_api.create_plugin_attribute( p_id=>wwv_flow_api.id(33032357089766730) @@ -2344,55 +2359,57 @@ wwv_flow_api.g_varchar2_table(176) := '696F6E732E6F7074696D697A65576179706F696E7 wwv_flow_api.g_varchar2_table(177) := '2020207D2C2066756E6374696F6E28726573706F6E73652C737461747573297B5F746869732E5F646972656374696F6E73526573706F6E736528726573706F6E73652C737461747573297D293B0D0A2020202020207D20656C7365207B0D0A2020202020'; wwv_flow_api.g_varchar2_table(178) := '202020617065782E646562756728226E6F7420656E6F75676820776179706F696E7473202D206E656564206174206C6561737420616E206F726967696E20616E6420612064657374696E6174696F6E20706F696E7422293B0D0A2020202020207D0D0A20'; wwv_flow_api.g_varchar2_table(179) := '2020207D2C0D0A0D0A202020202F2F2054686520636F6E7374727563746F720D0A202020205F6372656174653A2066756E6374696F6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E5F63726561746520222B7468'; -wwv_flow_api.g_varchar2_table(180) := '69732E656C656D656E742E70726F70282269642229293B0D0A202020202020617065782E646562756728226F7074696F6E733A20222B4A534F4E2E737472696E6769667928746869732E6F7074696F6E7329293B0D0A2020202020202F2F206765742061'; -wwv_flow_api.g_varchar2_table(181) := '62736F6C7574652055524C20666F72207468697320736974652C20696E636C7564696E67202F617065782F206F72202F6F7264732F20287468697320697320726571756972656420627920736F6D6520676F6F676C65206D6170732041504973290D0A20'; -wwv_flow_api.g_varchar2_table(182) := '20202020207661722066696C6550617468203D2077696E646F772E6C6F636174696F6E2E6F726967696E202B2077696E646F772E6C6F636174696F6E2E706174686E616D653B0D0A20202020202066696C6550617468203D2066696C65506174682E7375'; -wwv_flow_api.g_varchar2_table(183) := '62737472696E6728302C2066696C65506174682E6C617374496E6465784F6628222F2229293B0D0A202020202020746869732E696D616765507265666978203D2066696C6550617468202B20222F22202B20746869732E6F7074696F6E732E706C756769'; -wwv_flow_api.g_varchar2_table(184) := '6E46696C65507265666978202B2022696D616765732F6D223B0D0A202020202020617065782E64656275672827746869732E696D6167655072656669783D22272B746869732E696D6167655072656669782B272227293B0D0A202020202020766172206D'; -wwv_flow_api.g_varchar2_table(185) := '794F7074696F6E73203D207B0D0A20202020202020206D696E5A6F6F6D3A20746869732E6F7074696F6E732E6D696E5A6F6F6D2C0D0A20202020202020206D61785A6F6F6D3A20746869732E6F7074696F6E732E6D61785A6F6F6D2C0D0A202020202020'; -wwv_flow_api.g_varchar2_table(186) := '20207A6F6F6D3A20746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C0D0A202020202020202063656E7465723A20746869732E6F7074696F6E732E696E697469616C43656E7465722C0D0A20202020202020206D61705479706549643A2074'; -wwv_flow_api.g_varchar2_table(187) := '6869732E6F7074696F6E732E6D6170547970652C0D0A2020202020202020647261676761626C653A20746869732E6F7074696F6E732E616C6C6F7750616E2C0D0A20202020202020207A6F6F6D436F6E74726F6C3A20746869732E6F7074696F6E732E61'; -wwv_flow_api.g_varchar2_table(188) := '6C6C6F775A6F6F6D2C0D0A20202020202020207363726F6C6C776865656C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A202020202020202064697361626C65446F75626C65436C69636B5A6F6F6D3A202128746869732E6F707469'; -wwv_flow_api.g_varchar2_table(189) := '6F6E732E616C6C6F775A6F6F6D292C0D0A20202020202020206765737475726548616E646C696E673A20746869732E6F7074696F6E732E6765737475726548616E646C696E670D0A2020202020207D3B0D0A20202020202069662028746869732E6F7074'; -wwv_flow_api.g_varchar2_table(190) := '696F6E732E6D61705374796C6529207B0D0A20202020202020206D794F7074696F6E735B227374796C6573225D203D20746869732E6F7074696F6E732E6D61705374796C653B0D0A2020202020207D0D0A202020202020746869732E6D6170203D206E65'; -wwv_flow_api.g_varchar2_table(191) := '7720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E744279496428746869732E656C656D656E742E70726F70282269642229292C6D794F7074696F6E73293B0D0A20202020202069662028746869732E6F7074696F'; -wwv_flow_api.g_varchar2_table(192) := '6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F7274686561737429207B0D0A2020202020202020746869732E6D61702E666974426F756E6473286E657720676F6F676C652E6D6170732E4C61744C6E67426F756E647328746869'; -wwv_flow_api.g_varchar2_table(193) := '732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B0D0A2020202020207D0D0A202020202020766172205F74686973203D20746869733B0D0A202020202020676F6F676C652E6D6170732E65'; +wwv_flow_api.g_varchar2_table(180) := '69732E656C656D656E742E70726F70282269642229293B0D0A202020202020617065782E646562756728226F7074696F6E733A20222B4A534F4E2E737472696E6769667928746869732E6F7074696F6E7329293B0D0A202020202020766172205F746869'; +wwv_flow_api.g_varchar2_table(181) := '73203D20746869733B0D0A2020202020202F2F20676574206162736F6C7574652055524C20666F72207468697320736974652C20696E636C7564696E67202F617065782F206F72202F6F7264732F20287468697320697320726571756972656420627920'; +wwv_flow_api.g_varchar2_table(182) := '736F6D6520676F6F676C65206D6170732041504973290D0A2020202020207661722066696C6550617468203D2077696E646F772E6C6F636174696F6E2E6F726967696E202B2077696E646F772E6C6F636174696F6E2E706174686E616D653B0D0A202020'; +wwv_flow_api.g_varchar2_table(183) := '20202066696C6550617468203D2066696C65506174682E737562737472696E6728302C2066696C65506174682E6C617374496E6465784F6628222F2229293B0D0A202020202020746869732E696D616765507265666978203D2066696C6550617468202B'; +wwv_flow_api.g_varchar2_table(184) := '20222F22202B20746869732E6F7074696F6E732E706C7567696E46696C65507265666978202B2022696D616765732F6D223B0D0A202020202020617065782E64656275672827746869732E696D6167655072656669783D22272B746869732E696D616765'; +wwv_flow_api.g_varchar2_table(185) := '5072656669782B272227293B0D0A202020202020766172206D794F7074696F6E73203D207B0D0A20202020202020206D696E5A6F6F6D3A20746869732E6F7074696F6E732E6D696E5A6F6F6D2C0D0A20202020202020206D61785A6F6F6D3A2074686973'; +wwv_flow_api.g_varchar2_table(186) := '2E6F7074696F6E732E6D61785A6F6F6D2C0D0A20202020202020207A6F6F6D3A20746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C0D0A202020202020202063656E7465723A20746869732E6F7074696F6E732E696E697469616C43656E74'; +wwv_flow_api.g_varchar2_table(187) := '65722C0D0A20202020202020206D61705479706549643A20746869732E6F7074696F6E732E6D6170547970652C0D0A2020202020202020647261676761626C653A20746869732E6F7074696F6E732E616C6C6F7750616E2C0D0A20202020202020207A6F'; +wwv_flow_api.g_varchar2_table(188) := '6F6D436F6E74726F6C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A20202020202020207363726F6C6C776865656C3A20746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C0D0A202020202020202064697361626C65446F75'; +wwv_flow_api.g_varchar2_table(189) := '626C65436C69636B5A6F6F6D3A202128746869732E6F7074696F6E732E616C6C6F775A6F6F6D292C0D0A20202020202020206765737475726548616E646C696E673A20746869732E6F7074696F6E732E6765737475726548616E646C696E670D0A202020'; +wwv_flow_api.g_varchar2_table(190) := '2020207D3B0D0A20202020202069662028746869732E6F7074696F6E732E6D61705374796C6529207B0D0A20202020202020206D794F7074696F6E735B227374796C6573225D203D20746869732E6F7074696F6E732E6D61705374796C653B0D0A202020'; +wwv_flow_api.g_varchar2_table(191) := '2020207D0D0A202020202020746869732E6D6170203D206E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E744279496428746869732E656C656D656E742E70726F70282269642229292C6D794F7074696F6E'; +wwv_flow_api.g_varchar2_table(192) := '73293B0D0A20202020202069662028746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F7274686561737429207B0D0A2020202020202020746869732E6D61702E666974426F756E6473286E657720676F6F'; +wwv_flow_api.g_varchar2_table(193) := '676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B0D0A2020202020207D0D0A202020202020676F6F676C652E6D6170732E65'; wwv_flow_api.g_varchar2_table(194) := '76656E742E6164644C697374656E657228746869732E6D61702C2022636C69636B222C2066756E6374696F6E20286576656E7429207B0D0A2020202020202020617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E'; wwv_flow_api.g_varchar2_table(195) := '67696679286576656E742E6C61744C6E6729293B0D0A2020202020202020696620285F746869732E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C29207B0D0A20202020202020202020617065782E6465627567282270616E2B7A6F6F6D22293B'; wwv_flow_api.g_varchar2_table(196) := '0D0A20202020202020202020696620285F746869732E6F7074696F6E732E70616E4F6E436C69636B29207B0D0A2020202020202020202020205F746869732E6D61702E70616E546F286576656E742E6C61744C6E67293B0D0A202020202020202020207D'; wwv_flow_api.g_varchar2_table(197) := '0D0A202020202020202020205F746869732E6D61702E7365745A6F6F6D285F746869732E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C293B0D0A20202020202020207D0D0A2020202020202020617065782E6A5175657279282223222B5F7468'; wwv_flow_api.g_varchar2_table(198) := '69732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C207B6D61703A5F746869732E6D61702C206C61743A6576656E742E6C61744C6E672E6C617428292C206C6E673A6576656E742E6C61744C6E672E6C6E'; -wwv_flow_api.g_varchar2_table(199) := '6728297D293B0D0A2020202020207D293B0D0A20202020202069662028746869732E6F7074696F6E732E696E6974466E29207B0D0A2020202020202020617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64'; -wwv_flow_api.g_varchar2_table(200) := '652E2E2E22293B0D0A20202020202020202F2F696E736964652074686520696E697428292066756E6374696F6E2077652077616E742022746869732220746F20726566657220746F20746869730D0A2020202020202020746869732E696E69743D746869'; -wwv_flow_api.g_varchar2_table(201) := '732E6F7074696F6E732E696E6974466E3B0D0A2020202020202020746869732E696E697428293B0D0A2020202020207D0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A202020202020202074686973'; -wwv_flow_api.g_varchar2_table(202) := '2E7265667265736828293B0D0A2020202020207D0D0A202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C207B6D61703A746869732E6D61'; -wwv_flow_api.g_varchar2_table(203) := '707D293B0D0A202020202020617065782E646562756728227265706F72746D61702E696E69742066696E697368656422293B0D0A202020207D2C0D0A202020200D0A202020202F2F2043616C6C6564207768656E20637265617465642C20616E64206C61'; -wwv_flow_api.g_varchar2_table(204) := '746572207768656E206368616E67696E67206F7074696F6E730D0A20202020726566726573683A2066756E6374696F6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E7265667265736822293B0D0A202020202020'; -wwv_flow_api.g_varchar2_table(205) := '746869732E5F686964654D65737361676528293B0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A2020202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567'; -wwv_flow_api.g_varchar2_table(206) := '696F6E4964292E747269676765722822617065786265666F72657265667265736822293B0D0A2020202020202020766172205F74686973203D20746869733B0D0A2020202020202020617065782E7365727665722E706C7567696E0D0A20202020202020'; -wwv_flow_api.g_varchar2_table(207) := '20202028746869732E6F7074696F6E732E616A61784964656E7469666965720D0A202020202020202020202C7B20706167654974656D733A20746869732E6F7074696F6E732E616A61784974656D73207D0D0A202020202020202020202C7B2064617461'; -wwv_flow_api.g_varchar2_table(208) := '547970653A20226A736F6E220D0A2020202020202020202020202C737563636573733A2066756E6374696F6E282070446174612029207B0D0A2020202020202020202020202020617065782E646562756728227375636365737320736F75746877657374'; -wwv_flow_api.g_varchar2_table(209) := '3D222B4A534F4E2E737472696E676966792870446174612E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E676966792870446174612E6E6F7274686561737429293B0D0A20202020202020202020202020205F74'; -wwv_flow_api.g_varchar2_table(210) := '6869732E6D61702E666974426F756E6473280D0A202020202020202020202020202020207B736F7574683A70446174612E736F757468776573742E6C61740D0A202020202020202020202020202020202C776573743A2070446174612E736F7574687765'; -wwv_flow_api.g_varchar2_table(211) := '73742E6C6E670D0A202020202020202020202020202020202C6E6F7274683A70446174612E6E6F727468656173742E6C61740D0A202020202020202020202020202020202C656173743A2070446174612E6E6F727468656173742E6C6E677D293B0D0A20'; -wwv_flow_api.g_varchar2_table(212) := '20202020202020202020202020696620285F746869732E696E666F57696E646F7729207B0D0A202020202020202020202020202020205F746869732E696E666F57696E646F772E636C6F736528293B0D0A20202020202020202020202020207D0D0A2020'; -wwv_flow_api.g_varchar2_table(213) := '202020202020202020202020617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B70446174612E6D6170646174612E6C656E677468293B0D0A20202020202020202020202020205F746869732E5F72656D6F76654D61'; -wwv_flow_api.g_varchar2_table(214) := '726B65727328293B0D0A20202020202020202020202020206966202870446174612E6D61706461746129207B0D0A202020202020202020202020202020205F746869732E5F73686F77446174612870446174612E6D617064617461293B0D0A2020202020'; -wwv_flow_api.g_varchar2_table(215) := '2020202020202020202020696620285F746869732E6F7074696F6E732E76697375616C69736174696F6E3D3D22646972656374696F6E732229207B0D0A2020202020202020202020202020202020205F746869732E5F646972656374696F6E7328704461'; -wwv_flow_api.g_varchar2_table(216) := '74612E6D617064617461293B0D0A202020202020202020202020202020207D0D0A20202020202020202020202020207D0D0A2020202020202020202020202020617065782E6A5175657279282223222B5F746869732E6F7074696F6E732E726567696F6E'; -wwv_flow_api.g_varchar2_table(217) := '4964292E7472696767657228226170657861667465727265667265736822293B0D0A2020202020202020202020207D0D0A202020202020202020207D20293B0D0A2020202020207D0D0A202020202020617065782E646562756728227265706F72746D61'; -wwv_flow_api.g_varchar2_table(218) := '702E726566726573682066696E697368656422293B0D0A2020202020202F2F205472696767657220612063616C6C6261636B2F6576656E740D0A202020202020746869732E5F747269676765722820226368616E67652220293B0D0A202020207D2C0D0A'; -wwv_flow_api.g_varchar2_table(219) := '0D0A202020202F2F204576656E747320626F756E6420766961205F6F6E206172652072656D6F766564206175746F6D61746963616C6C790D0A202020202F2F20726576657274206F74686572206D6F64696669636174696F6E7320686572650D0A202020'; -wwv_flow_api.g_varchar2_table(220) := '205F64657374726F793A2066756E6374696F6E2829207B0D0A2020202020202F2F2072656D6F76652067656E65726174656420656C656D656E74730D0A20202020202069662028746869732E686561746D61704C6179657229207B20746869732E686561'; -wwv_flow_api.g_varchar2_table(221) := '746D61704C617965722E72656D6F766528293B207D0D0A20202020202069662028746869732E7573657270696E29207B2064656C65746520746869732E7573657270696E3B207D0D0A20202020202069662028746869732E646972656374696F6E734469'; -wwv_flow_api.g_varchar2_table(222) := '73706C617929207B2064656C65746520746869732E646972656374696F6E73446973706C61793B207D0D0A20202020202069662028746869732E646972656374696F6E735365727669636529207B2064656C65746520746869732E646972656374696F6E'; -wwv_flow_api.g_varchar2_table(223) := '73536572766963653B207D0D0A202020202020746869732E5F72656D6F76654D61726B65727328293B0D0A202020202020746869732E5F686964654D65737361676528293B0D0A202020202020746869732E6D61702E72656D6F766528293B0D0A202020'; -wwv_flow_api.g_varchar2_table(224) := '207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E732069732063616C6C6564207769746820612068617368206F6620616C6C206F7074696F6E73207468617420617265206368616E67696E670D0A202020202F2F20616C776179732072656672'; -wwv_flow_api.g_varchar2_table(225) := '657368207768656E206368616E67696E67206F7074696F6E730D0A202020205F7365744F7074696F6E733A2066756E6374696F6E2829207B0D0A2020202020202F2F205F737570657220616E64205F73757065724170706C792068616E646C65206B6565'; -wwv_flow_api.g_varchar2_table(226) := '70696E672074686520726967687420746869732D636F6E746578740D0A202020202020746869732E5F73757065724170706C792820617267756D656E747320293B0D0A202020202020746869732E7265667265736828293B0D0A202020207D2C0D0A0D0A'; -wwv_flow_api.g_varchar2_table(227) := '202020202F2F205F7365744F7074696F6E2069732063616C6C656420666F72206561636820696E646976696475616C206F7074696F6E2074686174206973206368616E67696E670D0A202020205F7365744F7074696F6E3A2066756E6374696F6E28206B'; -wwv_flow_api.g_varchar2_table(228) := '65792C2076616C75652029207B0D0A202020202020746869732E5F737570657228206B65792C2076616C756520293B0D0A202020207D2020202020200D0A0D0A20207D293B0D0A7D293B'; +wwv_flow_api.g_varchar2_table(199) := '6728297D293B0D0A2020202020207D293B0D0A202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E62696E6428226170657872656672657368222C66756E6374696F6E28297B0D0A20202020'; +wwv_flow_api.g_varchar2_table(200) := '20202020242822236D61705F222B5F746869732E6F7074696F6E732E726567696F6E4964292E7265706F72746D617028227265667265736822293B0D0A2020202020207D293B0D0A20202020202069662028746869732E6F7074696F6E732E696E697446'; +wwv_flow_api.g_varchar2_table(201) := '6E29207B0D0A2020202020202020617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64652E2E2E22293B0D0A20202020202020202F2F696E736964652074686520696E697428292066756E6374696F6E2077'; +wwv_flow_api.g_varchar2_table(202) := '652077616E742022746869732220746F20726566657220746F20746869730D0A2020202020202020746869732E696E69743D746869732E6F7074696F6E732E696E6974466E3B0D0A2020202020202020746869732E696E697428293B0D0A202020202020'; +wwv_flow_api.g_varchar2_table(203) := '7D0D0A20202020202069662028746869732E6F7074696F6E732E6578706563744461746129207B0D0A2020202020202020746869732E7265667265736828293B0D0A2020202020207D0D0A202020202020617065782E6A5175657279282223222B746869'; +wwv_flow_api.g_varchar2_table(204) := '732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C207B6D61703A746869732E6D61707D293B0D0A202020202020617065782E646562756728227265706F72746D61702E696E69742066696E6973686564'; +wwv_flow_api.g_varchar2_table(205) := '22293B0D0A202020207D2C0D0A202020200D0A202020202F2F2043616C6C6564207768656E20637265617465642C20616E64206C61746572207768656E206368616E67696E67206F7074696F6E730D0A20202020726566726573683A2066756E6374696F'; +wwv_flow_api.g_varchar2_table(206) := '6E2829207B0D0A202020202020617065782E646562756728227265706F72746D61702E7265667265736822293B0D0A202020202020746869732E5F686964654D65737361676528293B0D0A20202020202069662028746869732E6F7074696F6E732E6578'; +wwv_flow_api.g_varchar2_table(207) := '706563744461746129207B0D0A2020202020202020617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B0D0A202020202020202076'; +wwv_flow_api.g_varchar2_table(208) := '6172205F74686973203D20746869733B0D0A2020202020202020617065782E7365727665722E706C7567696E0D0A2020202020202020202028746869732E6F7074696F6E732E616A61784964656E7469666965720D0A202020202020202020202C7B2070'; +wwv_flow_api.g_varchar2_table(209) := '6167654974656D733A20746869732E6F7074696F6E732E616A61784974656D73207D0D0A202020202020202020202C7B2064617461547970653A20226A736F6E220D0A2020202020202020202020202C737563636573733A2066756E6374696F6E282070'; +wwv_flow_api.g_varchar2_table(210) := '446174612029207B0D0A2020202020202020202020202020617065782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E676966792870446174612E736F75746877657374292B22206E6F727468656173743D'; +wwv_flow_api.g_varchar2_table(211) := '222B4A534F4E2E737472696E676966792870446174612E6E6F7274686561737429293B0D0A20202020202020202020202020205F746869732E6D61702E666974426F756E6473280D0A202020202020202020202020202020207B736F7574683A70446174'; +wwv_flow_api.g_varchar2_table(212) := '612E736F757468776573742E6C61740D0A202020202020202020202020202020202C776573743A2070446174612E736F757468776573742E6C6E670D0A202020202020202020202020202020202C6E6F7274683A70446174612E6E6F727468656173742E'; +wwv_flow_api.g_varchar2_table(213) := '6C61740D0A202020202020202020202020202020202C656173743A2070446174612E6E6F727468656173742E6C6E677D293B0D0A2020202020202020202020202020696620285F746869732E696E666F57696E646F7729207B0D0A202020202020202020'; +wwv_flow_api.g_varchar2_table(214) := '202020202020205F746869732E696E666F57696E646F772E636C6F736528293B0D0A20202020202020202020202020207D0D0A2020202020202020202020202020617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B'; +wwv_flow_api.g_varchar2_table(215) := '70446174612E6D6170646174612E6C656E677468293B0D0A20202020202020202020202020205F746869732E5F72656D6F76654D61726B65727328293B0D0A20202020202020202020202020206966202870446174612E6D61706461746129207B0D0A20'; +wwv_flow_api.g_varchar2_table(216) := '2020202020202020202020202020205F746869732E5F73686F77446174612870446174612E6D617064617461293B0D0A20202020202020202020202020202020696620285F746869732E6F7074696F6E732E76697375616C69736174696F6E3D3D226469'; +wwv_flow_api.g_varchar2_table(217) := '72656374696F6E732229207B0D0A2020202020202020202020202020202020205F746869732E5F646972656374696F6E732870446174612E6D617064617461293B0D0A202020202020202020202020202020207D0D0A2020202020202020202020202020'; +wwv_flow_api.g_varchar2_table(218) := '7D0D0A2020202020202020202020202020617065782E6A5175657279282223222B5F746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822293B0D0A2020202020202020202020207D'; +wwv_flow_api.g_varchar2_table(219) := '0D0A202020202020202020207D20293B0D0A2020202020207D0D0A202020202020617065782E646562756728227265706F72746D61702E726566726573682066696E697368656422293B0D0A2020202020202F2F205472696767657220612063616C6C62'; +wwv_flow_api.g_varchar2_table(220) := '61636B2F6576656E740D0A202020202020746869732E5F747269676765722820226368616E67652220293B0D0A202020207D2C0D0A0D0A202020202F2F204576656E747320626F756E6420766961205F6F6E206172652072656D6F766564206175746F6D'; +wwv_flow_api.g_varchar2_table(221) := '61746963616C6C790D0A202020202F2F20726576657274206F74686572206D6F64696669636174696F6E7320686572650D0A202020205F64657374726F793A2066756E6374696F6E2829207B0D0A2020202020202F2F2072656D6F76652067656E657261'; +wwv_flow_api.g_varchar2_table(222) := '74656420656C656D656E74730D0A20202020202069662028746869732E686561746D61704C6179657229207B20746869732E686561746D61704C617965722E72656D6F766528293B207D0D0A20202020202069662028746869732E7573657270696E2920'; +wwv_flow_api.g_varchar2_table(223) := '7B2064656C65746520746869732E7573657270696E3B207D0D0A20202020202069662028746869732E646972656374696F6E73446973706C617929207B2064656C65746520746869732E646972656374696F6E73446973706C61793B207D0D0A20202020'; +wwv_flow_api.g_varchar2_table(224) := '202069662028746869732E646972656374696F6E735365727669636529207B2064656C65746520746869732E646972656374696F6E73536572766963653B207D0D0A202020202020746869732E5F72656D6F76654D61726B65727328293B0D0A20202020'; +wwv_flow_api.g_varchar2_table(225) := '2020746869732E5F686964654D65737361676528293B0D0A202020202020746869732E6D61702E72656D6F766528293B0D0A202020207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E732069732063616C6C6564207769746820612068617368'; +wwv_flow_api.g_varchar2_table(226) := '206F6620616C6C206F7074696F6E73207468617420617265206368616E67696E670D0A202020202F2F20616C776179732072656672657368207768656E206368616E67696E67206F7074696F6E730D0A202020205F7365744F7074696F6E733A2066756E'; +wwv_flow_api.g_varchar2_table(227) := '6374696F6E2829207B0D0A2020202020202F2F205F737570657220616E64205F73757065724170706C792068616E646C65206B656570696E672074686520726967687420746869732D636F6E746578740D0A202020202020746869732E5F737570657241'; +wwv_flow_api.g_varchar2_table(228) := '70706C792820617267756D656E747320293B0D0A202020202020746869732E7265667265736828293B0D0A202020207D2C0D0A0D0A202020202F2F205F7365744F7074696F6E2069732063616C6C656420666F72206561636820696E646976696475616C'; +wwv_flow_api.g_varchar2_table(229) := '206F7074696F6E2074686174206973206368616E67696E670D0A202020205F7365744F7074696F6E3A2066756E6374696F6E28206B65792C2076616C75652029207B0D0A202020202020746869732E5F737570657228206B65792C2076616C756520293B'; +wwv_flow_api.g_varchar2_table(230) := '0D0A202020207D2020202020200D0A0D0A20207D293B0D0A7D293B'; null; end; / @@ -2501,34 +2518,35 @@ wwv_flow_api.g_varchar2_table(89) := '696F6E73536572766963652E726F757465287B6F72 wwv_flow_api.g_varchar2_table(90) := '74732C74726176656C4D6F64653A676F6F676C652E6D6170732E54726176656C4D6F64655B746869732E6F7074696F6E732E74726176656C4D6F64655D7D2C66756E6374696F6E28652C74297B6E2E5F646972656374696F6E73526573706F6E73652865'; wwv_flow_api.g_varchar2_table(91) := '2C74297D297D656C736520617065782E646562756728226E6F7420656E6F75676820776179706F696E7473202D206E656564206174206C6561737420616E206F726967696E20616E6420612064657374696E6174696F6E20706F696E7422297D2C5F6372'; wwv_flow_api.g_varchar2_table(92) := '656174653A66756E6374696F6E28297B617065782E646562756728227265706F72746D61702E5F63726561746520222B746869732E656C656D656E742E70726F70282269642229292C617065782E646562756728226F7074696F6E733A20222B4A534F4E'; -wwv_flow_api.g_varchar2_table(93) := '2E737472696E6769667928746869732E6F7074696F6E7329293B76617220653D77696E646F772E6C6F636174696F6E2E6F726967696E2B77696E646F772E6C6F636174696F6E2E706174686E616D653B653D652E737562737472696E6728302C652E6C61'; -wwv_flow_api.g_varchar2_table(94) := '7374496E6465784F6628222F2229292C746869732E696D6167655072656669783D652B222F222B746869732E6F7074696F6E732E706C7567696E46696C655072656669782B22696D616765732F6D222C617065782E64656275672827746869732E696D61'; -wwv_flow_api.g_varchar2_table(95) := '67655072656669783D22272B746869732E696D6167655072656669782B272227293B76617220743D7B6D696E5A6F6F6D3A746869732E6F7074696F6E732E6D696E5A6F6F6D2C6D61785A6F6F6D3A746869732E6F7074696F6E732E6D61785A6F6F6D2C7A'; -wwv_flow_api.g_varchar2_table(96) := '6F6F6D3A746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C63656E7465723A746869732E6F7074696F6E732E696E697469616C43656E7465722C6D61705479706549643A746869732E6F7074696F6E732E6D6170547970652C647261676761'; -wwv_flow_api.g_varchar2_table(97) := '626C653A746869732E6F7074696F6E732E616C6C6F7750616E2C7A6F6F6D436F6E74726F6C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C7363726F6C6C776865656C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C64697361'; -wwv_flow_api.g_varchar2_table(98) := '626C65446F75626C65436C69636B5A6F6F6D3A21746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C6765737475726548616E646C696E673A746869732E6F7074696F6E732E6765737475726548616E646C696E677D3B746869732E6F7074696F6E'; -wwv_flow_api.g_varchar2_table(99) := '732E6D61705374796C65262628742E7374796C65733D746869732E6F7074696F6E732E6D61705374796C65292C746869732E6D61703D6E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E7442794964287468'; -wwv_flow_api.g_varchar2_table(100) := '69732E656C656D656E742E70726F70282269642229292C74292C746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F727468656173742626746869732E6D61702E666974426F756E6473286E657720676F6F'; -wwv_flow_api.g_varchar2_table(101) := '676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429293B76617220693D746869733B676F6F676C652E6D6170732E6576656E742E61'; -wwv_flow_api.g_varchar2_table(102) := '64644C697374656E657228746869732E6D61702C22636C69636B222C66756E6374696F6E2865297B617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E6769667928652E6C61744C6E6729292C692E6F7074696F6E'; -wwv_flow_api.g_varchar2_table(103) := '732E636C69636B5A6F6F6D4C6576656C262628617065782E6465627567282270616E2B7A6F6F6D22292C692E6F7074696F6E732E70616E4F6E436C69636B2626692E6D61702E70616E546F28652E6C61744C6E67292C692E6D61702E7365745A6F6F6D28'; -wwv_flow_api.g_varchar2_table(104) := '692E6F7074696F6E732E636C69636B5A6F6F6D4C6576656C29292C617065782E6A5175657279282223222B692E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C7B6D61703A692E6D61702C6C61743A652E6C'; -wwv_flow_api.g_varchar2_table(105) := '61744C6E672E6C617428292C6C6E673A652E6C61744C6E672E6C6E6728297D297D292C746869732E6F7074696F6E732E696E6974466E262628617065782E6465627567282272756E6E696E6720696E69745F6A6176617363726970745F636F64652E2E2E'; -wwv_flow_api.g_varchar2_table(106) := '22292C746869732E696E69743D746869732E6F7074696F6E732E696E6974466E2C746869732E696E69742829292C746869732E6F7074696F6E732E657870656374446174612626746869732E7265667265736828292C617065782E6A5175657279282223'; -wwv_flow_api.g_varchar2_table(107) := '222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C7B6D61703A746869732E6D61707D292C617065782E646562756728227265706F72746D61702E696E69742066696E697368656422297D2C'; -wwv_flow_api.g_varchar2_table(108) := '726566726573683A66756E6374696F6E28297B696628617065782E646562756728227265706F72746D61702E7265667265736822292C746869732E5F686964654D65737361676528292C746869732E6F7074696F6E732E65787065637444617461297B61'; -wwv_flow_api.g_varchar2_table(109) := '7065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B76617220653D746869733B617065782E7365727665722E706C7567696E28746869'; -wwv_flow_api.g_varchar2_table(110) := '732E6F7074696F6E732E616A61784964656E7469666965722C7B706167654974656D733A746869732E6F7074696F6E732E616A61784974656D737D2C7B64617461547970653A226A736F6E222C737563636573733A66756E6374696F6E2874297B617065'; -wwv_flow_api.g_varchar2_table(111) := '782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E6769667928742E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E6769667928742E6E6F7274686561737429292C'; -wwv_flow_api.g_varchar2_table(112) := '652E6D61702E666974426F756E6473287B736F7574683A742E736F757468776573742E6C61742C776573743A742E736F757468776573742E6C6E672C6E6F7274683A742E6E6F727468656173742E6C61742C656173743A742E6E6F727468656173742E6C'; -wwv_flow_api.g_varchar2_table(113) := '6E677D292C652E696E666F57696E646F772626652E696E666F57696E646F772E636C6F736528292C617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B742E6D6170646174612E6C656E677468292C652E5F72656D6F'; -wwv_flow_api.g_varchar2_table(114) := '76654D61726B65727328292C742E6D617064617461262628652E5F73686F774461746128742E6D617064617461292C22646972656374696F6E73223D3D652E6F7074696F6E732E76697375616C69736174696F6E2626652E5F646972656374696F6E7328'; -wwv_flow_api.g_varchar2_table(115) := '742E6D61706461746129292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822297D7D297D617065782E646562756728227265706F72746D6170'; -wwv_flow_api.g_varchar2_table(116) := '2E726566726573682066696E697368656422292C746869732E5F7472696767657228226368616E676522297D2C5F64657374726F793A66756E6374696F6E28297B746869732E686561746D61704C617965722626746869732E686561746D61704C617965'; -wwv_flow_api.g_varchar2_table(117) := '722E72656D6F766528292C746869732E7573657270696E262664656C65746520746869732E7573657270696E2C746869732E646972656374696F6E73446973706C6179262664656C65746520746869732E646972656374696F6E73446973706C61792C74'; -wwv_flow_api.g_varchar2_table(118) := '6869732E646972656374696F6E7353657276696365262664656C65746520746869732E646972656374696F6E73536572766963652C746869732E5F72656D6F76654D61726B65727328292C746869732E5F686964654D65737361676528292C746869732E'; -wwv_flow_api.g_varchar2_table(119) := '6D61702E72656D6F766528297D2C5F7365744F7074696F6E733A66756E6374696F6E28297B746869732E5F73757065724170706C7928617267756D656E7473292C746869732E7265667265736828297D2C5F7365744F7074696F6E3A66756E6374696F6E'; -wwv_flow_api.g_varchar2_table(120) := '28652C74297B746869732E5F737570657228652C74297D7D297D293B'; +wwv_flow_api.g_varchar2_table(93) := '2E737472696E6769667928746869732E6F7074696F6E7329293B76617220653D746869732C743D77696E646F772E6C6F636174696F6E2E6F726967696E2B77696E646F772E6C6F636174696F6E2E706174686E616D653B743D742E737562737472696E67'; +wwv_flow_api.g_varchar2_table(94) := '28302C742E6C617374496E6465784F6628222F2229292C746869732E696D6167655072656669783D742B222F222B746869732E6F7074696F6E732E706C7567696E46696C655072656669782B22696D616765732F6D222C617065782E6465627567282774'; +wwv_flow_api.g_varchar2_table(95) := '6869732E696D6167655072656669783D22272B746869732E696D6167655072656669782B272227293B76617220693D7B6D696E5A6F6F6D3A746869732E6F7074696F6E732E6D696E5A6F6F6D2C6D61785A6F6F6D3A746869732E6F7074696F6E732E6D61'; +wwv_flow_api.g_varchar2_table(96) := '785A6F6F6D2C7A6F6F6D3A746869732E6F7074696F6E732E696E697469616C5A6F6F6D2C63656E7465723A746869732E6F7074696F6E732E696E697469616C43656E7465722C6D61705479706549643A746869732E6F7074696F6E732E6D617054797065'; +wwv_flow_api.g_varchar2_table(97) := '2C647261676761626C653A746869732E6F7074696F6E732E616C6C6F7750616E2C7A6F6F6D436F6E74726F6C3A746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C7363726F6C6C776865656C3A746869732E6F7074696F6E732E616C6C6F775A6F'; +wwv_flow_api.g_varchar2_table(98) := '6F6D2C64697361626C65446F75626C65436C69636B5A6F6F6D3A21746869732E6F7074696F6E732E616C6C6F775A6F6F6D2C6765737475726548616E646C696E673A746869732E6F7074696F6E732E6765737475726548616E646C696E677D3B74686973'; +wwv_flow_api.g_varchar2_table(99) := '2E6F7074696F6E732E6D61705374796C65262628692E7374796C65733D746869732E6F7074696F6E732E6D61705374796C65292C746869732E6D61703D6E657720676F6F676C652E6D6170732E4D617028646F63756D656E742E676574456C656D656E74'; +wwv_flow_api.g_varchar2_table(100) := '4279496428746869732E656C656D656E742E70726F70282269642229292C69292C746869732E6F7074696F6E732E736F757468776573742626746869732E6F7074696F6E732E6E6F727468656173742626746869732E6D61702E666974426F756E647328'; +wwv_flow_api.g_varchar2_table(101) := '6E657720676F6F676C652E6D6170732E4C61744C6E67426F756E647328746869732E6F7074696F6E732E736F757468776573742C746869732E6F7074696F6E732E6E6F7274686561737429292C676F6F676C652E6D6170732E6576656E742E6164644C69'; +wwv_flow_api.g_varchar2_table(102) := '7374656E657228746869732E6D61702C22636C69636B222C66756E6374696F6E2874297B617065782E646562756728226D617020636C69636B656420222B4A534F4E2E737472696E6769667928742E6C61744C6E6729292C652E6F7074696F6E732E636C'; +wwv_flow_api.g_varchar2_table(103) := '69636B5A6F6F6D4C6576656C262628617065782E6465627567282270616E2B7A6F6F6D22292C652E6F7074696F6E732E70616E4F6E436C69636B2626652E6D61702E70616E546F28742E6C61744C6E67292C652E6D61702E7365745A6F6F6D28652E6F70'; +wwv_flow_api.g_varchar2_table(104) := '74696F6E732E636C69636B5A6F6F6D4C6576656C29292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226D6170636C69636B222C7B6D61703A652E6D61702C6C61743A742E6C61744C6E'; +wwv_flow_api.g_varchar2_table(105) := '672E6C617428292C6C6E673A742E6C61744C6E672E6C6E6728297D297D292C617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E62696E6428226170657872656672657368222C66756E6374696F6E28297B'; +wwv_flow_api.g_varchar2_table(106) := '242822236D61705F222B652E6F7074696F6E732E726567696F6E4964292E7265706F72746D617028227265667265736822297D292C746869732E6F7074696F6E732E696E6974466E262628617065782E6465627567282272756E6E696E6720696E69745F'; +wwv_flow_api.g_varchar2_table(107) := '6A6176617363726970745F636F64652E2E2E22292C746869732E696E69743D746869732E6F7074696F6E732E696E6974466E2C746869732E696E69742829292C746869732E6F7074696F6E732E657870656374446174612626746869732E726566726573'; +wwv_flow_api.g_varchar2_table(108) := '6828292C617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E7472696767657228226D61706C6F61646564222C7B6D61703A746869732E6D61707D292C617065782E646562756728227265706F72746D6170'; +wwv_flow_api.g_varchar2_table(109) := '2E696E69742066696E697368656422297D2C726566726573683A66756E6374696F6E28297B696628617065782E646562756728227265706F72746D61702E7265667265736822292C746869732E5F686964654D65737361676528292C746869732E6F7074'; +wwv_flow_api.g_varchar2_table(110) := '696F6E732E65787065637444617461297B617065782E6A5175657279282223222B746869732E6F7074696F6E732E726567696F6E4964292E747269676765722822617065786265666F72657265667265736822293B76617220653D746869733B61706578'; +wwv_flow_api.g_varchar2_table(111) := '2E7365727665722E706C7567696E28746869732E6F7074696F6E732E616A61784964656E7469666965722C7B706167654974656D733A746869732E6F7074696F6E732E616A61784974656D737D2C7B64617461547970653A226A736F6E222C7375636365'; +wwv_flow_api.g_varchar2_table(112) := '73733A66756E6374696F6E2874297B617065782E646562756728227375636365737320736F757468776573743D222B4A534F4E2E737472696E6769667928742E736F75746877657374292B22206E6F727468656173743D222B4A534F4E2E737472696E67'; +wwv_flow_api.g_varchar2_table(113) := '69667928742E6E6F7274686561737429292C652E6D61702E666974426F756E6473287B736F7574683A742E736F757468776573742E6C61742C776573743A742E736F757468776573742E6C6E672C6E6F7274683A742E6E6F727468656173742E6C61742C'; +wwv_flow_api.g_varchar2_table(114) := '656173743A742E6E6F727468656173742E6C6E677D292C652E696E666F57696E646F772626652E696E666F57696E646F772E636C6F736528292C617065782E6465627567282270446174612E6D6170646174612E6C656E6774683D222B742E6D61706461'; +wwv_flow_api.g_varchar2_table(115) := '74612E6C656E677468292C652E5F72656D6F76654D61726B65727328292C742E6D617064617461262628652E5F73686F774461746128742E6D617064617461292C22646972656374696F6E73223D3D652E6F7074696F6E732E76697375616C6973617469'; +wwv_flow_api.g_varchar2_table(116) := '6F6E2626652E5F646972656374696F6E7328742E6D61706461746129292C617065782E6A5175657279282223222B652E6F7074696F6E732E726567696F6E4964292E7472696767657228226170657861667465727265667265736822297D7D297D617065'; +wwv_flow_api.g_varchar2_table(117) := '782E646562756728227265706F72746D61702E726566726573682066696E697368656422292C746869732E5F7472696767657228226368616E676522297D2C5F64657374726F793A66756E6374696F6E28297B746869732E686561746D61704C61796572'; +wwv_flow_api.g_varchar2_table(118) := '2626746869732E686561746D61704C617965722E72656D6F766528292C746869732E7573657270696E262664656C65746520746869732E7573657270696E2C746869732E646972656374696F6E73446973706C6179262664656C65746520746869732E64'; +wwv_flow_api.g_varchar2_table(119) := '6972656374696F6E73446973706C61792C746869732E646972656374696F6E7353657276696365262664656C65746520746869732E646972656374696F6E73536572766963652C746869732E5F72656D6F76654D61726B65727328292C746869732E5F68'; +wwv_flow_api.g_varchar2_table(120) := '6964654D65737361676528292C746869732E6D61702E72656D6F766528297D2C5F7365744F7074696F6E733A66756E6374696F6E28297B746869732E5F73757065724170706C7928617267756D656E7473292C746869732E7265667265736828297D2C5F'; +wwv_flow_api.g_varchar2_table(121) := '7365744F7074696F6E3A66756E6374696F6E28652C74297B746869732E5F737570657228652C74297D7D297D293B'; null; end; / diff --git a/src/jk64reportmap_r1.js b/src/jk64reportmap_r1.js index b869d01..4b7fbc8 100644 --- a/src/jk64reportmap_r1.js +++ b/src/jk64reportmap_r1.js @@ -466,6 +466,7 @@ $( function() { _create: function() { apex.debug("reportmap._create "+this.element.prop("id")); apex.debug("options: "+JSON.stringify(this.options)); + var _this = this; // get absolute URL for this site, including /apex/ or /ords/ (this is required by some google maps APIs) var filePath = window.location.origin + window.location.pathname; filePath = filePath.substring(0, filePath.lastIndexOf("/")); @@ -490,7 +491,6 @@ $( function() { if (this.options.southwest&&this.options.northeast) { this.map.fitBounds(new google.maps.LatLngBounds(this.options.southwest,this.options.northeast)); } - var _this = this; google.maps.event.addListener(this.map, "click", function (event) { apex.debug("map clicked "+JSON.stringify(event.latLng)); if (_this.options.clickZoomLevel) { @@ -502,6 +502,9 @@ $( function() { } apex.jQuery("#"+_this.options.regionId).trigger("mapclick", {map:_this.map, lat:event.latLng.lat(), lng:event.latLng.lng()}); }); + apex.jQuery("#"+this.options.regionId).bind("apexrefresh",function(){ + $("#map_"+_this.options.regionId).reportmap("refresh"); + }); if (this.options.initFn) { apex.debug("running init_javascript_code..."); //inside the init() function we want "this" to refer to this diff --git a/src/jk64reportmap_r1.min.js b/src/jk64reportmap_r1.min.js index c9ab0d3..01639b2 100644 --- a/src/jk64reportmap_r1.min.js +++ b/src/jk64reportmap_r1.min.js @@ -1 +1 @@ -$(function(){$.widget("jk64.reportmap",{options:{regionId:"",ajaxIdentifier:"",ajaxItems:"",pluginFilePrefix:"",expectData:!0,initialCenter:{lat:0,lng:0},minZoom:1,maxZoom:null,initialZoom:2,southwest:null,northeast:null,visualisation:"pins",mapType:"roadmap",clickZoomLevel:null,isDraggable:!1,heatmapDissipating:!1,heatmapOpacity:.6,heatmapRadius:5,panOnClick:!0,restrictCountry:"",mapStyle:"",travelMode:"DRIVING",optimizeWaypoints:!1,allowZoom:!0,allowPan:!0,gestureHandling:"auto",initFn:null,noDataMessage:"No data to show",noAddressResults:"Address not found",directionsNotFound:"At least one of the origin, destination, or waypoints could not be geocoded.",directionsZeroResults:"No route could be found between the origin and destination.",parseLatLng:null,click:null,geolocate:null,gotoAddress:null,gotoPos:null,gotoPosByString:null,refresh:null,getAddressByPos:null,showDirections:null},parseLatLng:function(e){var t,i;(apex.debug("reportmap.parseLatLng "+e),null!=e)&&(e.indexOf(";")>-1?i=e.split(";"):e.indexOf(" ")>-1?i=e.split(" "):e.indexOf(",")>-1&&(i=e.split(",")),i&&2==i.length?(i[0]=i[0].replace(/,/g,"."),i[1]=i[1].replace(/,/g,"."),apex.debug("parsed "+i[0]+" "+i[1]),t=new google.maps.LatLng(parseFloat(i[0]),parseFloat(i[1]))):apex.debug('no LatLng found in "'+e+'"'));return t},_showMessage:function(e){apex.debug("reportmap._showMessage '"+e+"'"),this.infoWindow?this.infoWindow.close():this.infoWindow=new google.maps.InfoWindow({content:e,position:this.map.getCenter()}),this.infoWindow.open(this.map)},_hideMessage:function(){apex.debug("reportmap._hideMessage "),this.infoWindow&&this.infoWindow.close()},_pinData:function(e,t){var i={map:this.map,id:e.d,name:e.n,lat:t.lat(),lng:t.lng()};return e.f&&(e.f.a1&&(i.attr01=e.f.a1),e.f.a2&&(i.attr02=e.f.a2),e.f.a3&&(i.attr03=e.f.a3),e.f.a4&&(i.attr04=e.f.a4),e.f.a5&&(i.attr05=e.f.a5),e.f.a6&&(i.attr06=e.f.a6),e.f.a7&&(i.attr07=e.f.a7),e.f.a8&&(i.attr08=e.f.a8),e.f.a9&&(i.attr09=e.f.a9),e.f.a10&&(i.attr10=e.f.a10)),i},_marker:function(e){var t=new google.maps.Marker({map:this.map,position:new google.maps.LatLng(e.x,e.y),title:e.n,icon:e.c,label:e.l,draggable:this.options.isDraggable});t.reportmapId=e.d;var i=this;return google.maps.event.addListener(t,"click",function(){apex.debug("marker "+e.d+" clicked");var t=this.getPosition();if(e.i){i.infoWindow?i.infoWindow.close():i.infoWindow=new google.maps.InfoWindow;var o=(new DOMParser).parseFromString(e.i,"text/html");i.infoWindow.setOptions({content:o.documentElement.textContent}),i.infoWindow.open(i.map,this)}i.options.panOnClick&&i.map.panTo(t),i.options.clickZoomLevel&&i.map.setZoom(i.options.clickZoomLevel),apex.jQuery("#"+i.options.regionId).trigger("markerclick",i._pinData(e,t))}),google.maps.event.addListener(t,"dragend",function(){var t=this.getPosition();apex.debug("marker "+e.d+" moved to "+JSON.stringify(t)),apex.jQuery("#"+i.options.regionId).trigger("markerdrag",i._pinData(e,t))}),t},_showData:function(e){if(apex.debug("reportmap._showData"),e.length>0){this._hideMessage();var t=[];this.markers=[];for(var i=0;i1){var t,i;this.directionsDisplay||(this.directionsDisplay=new google.maps.DirectionsRenderer,this.directionsService=new google.maps.DirectionsService,this.directionsDisplay.setMap(this.map));for(var o,s=[],a=0;a-1?i=e.split(";"):e.indexOf(" ")>-1?i=e.split(" "):e.indexOf(",")>-1&&(i=e.split(",")),i&&2==i.length?(i[0]=i[0].replace(/,/g,"."),i[1]=i[1].replace(/,/g,"."),apex.debug("parsed "+i[0]+" "+i[1]),t=new google.maps.LatLng(parseFloat(i[0]),parseFloat(i[1]))):apex.debug('no LatLng found in "'+e+'"'));return t},_showMessage:function(e){apex.debug("reportmap._showMessage '"+e+"'"),this.infoWindow?this.infoWindow.close():this.infoWindow=new google.maps.InfoWindow({content:e,position:this.map.getCenter()}),this.infoWindow.open(this.map)},_hideMessage:function(){apex.debug("reportmap._hideMessage "),this.infoWindow&&this.infoWindow.close()},_pinData:function(e,t){var i={map:this.map,id:e.d,name:e.n,lat:t.lat(),lng:t.lng()};return e.f&&(e.f.a1&&(i.attr01=e.f.a1),e.f.a2&&(i.attr02=e.f.a2),e.f.a3&&(i.attr03=e.f.a3),e.f.a4&&(i.attr04=e.f.a4),e.f.a5&&(i.attr05=e.f.a5),e.f.a6&&(i.attr06=e.f.a6),e.f.a7&&(i.attr07=e.f.a7),e.f.a8&&(i.attr08=e.f.a8),e.f.a9&&(i.attr09=e.f.a9),e.f.a10&&(i.attr10=e.f.a10)),i},_marker:function(e){var t=new google.maps.Marker({map:this.map,position:new google.maps.LatLng(e.x,e.y),title:e.n,icon:e.c,label:e.l,draggable:this.options.isDraggable});t.reportmapId=e.d;var i=this;return google.maps.event.addListener(t,"click",function(){apex.debug("marker "+e.d+" clicked");var t=this.getPosition();if(e.i){i.infoWindow?i.infoWindow.close():i.infoWindow=new google.maps.InfoWindow;var o=(new DOMParser).parseFromString(e.i,"text/html");i.infoWindow.setOptions({content:o.documentElement.textContent}),i.infoWindow.open(i.map,this)}i.options.panOnClick&&i.map.panTo(t),i.options.clickZoomLevel&&i.map.setZoom(i.options.clickZoomLevel),apex.jQuery("#"+i.options.regionId).trigger("markerclick",i._pinData(e,t))}),google.maps.event.addListener(t,"dragend",function(){var t=this.getPosition();apex.debug("marker "+e.d+" moved to "+JSON.stringify(t)),apex.jQuery("#"+i.options.regionId).trigger("markerdrag",i._pinData(e,t))}),t},_showData:function(e){if(apex.debug("reportmap._showData"),e.length>0){this._hideMessage();var t=[];this.markers=[];for(var i=0;i1){var t,i;this.directionsDisplay||(this.directionsDisplay=new google.maps.DirectionsRenderer,this.directionsService=new google.maps.DirectionsService,this.directionsDisplay.setMap(this.map));for(var o,s=[],a=0;a 0 then @@ -83,6 +83,30 @@ begin p_lng := apex_plugin_util.get_attribute_as_number(substr(p_val,delim_pos+1), p_label || ' longitude'); end parse_latlng; +function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is + n number; +begin + n := apex_plugin_util.get_attribute_as_number(p_attr, p_label); + if not n between 0 and 23 then + raise_application_error(-20000, p_label || ': must be in range 0..23 ("' || p_attr || '")'); + end if; + return n; +end valid_zoom_level; + +procedure get_lat_lng_attr + (lat_val in varchar2 + ,lng_val in varchar2 + ,record_no in number + ,p_lat out number + ,p_lng out number + ) is +begin + p_lat := round(apex_plugin_util.get_attribute_as_number(lat_val,'Latitude (#'||record_no||')') + ,g_coord_precision); + p_lng := round(apex_plugin_util.get_attribute_as_number(lng_val,'Longitude (#'||record_no||')') + ,g_coord_precision); +end get_lat_lng_attr; + function get_markers (p_plugin in apex_plugin.t_plugin ,p_region in apex_plugin.t_region @@ -102,7 +126,7 @@ function get_markers l_max_rows number; --p_plugin.attribute_07; l_visualisation plugin_attr := p_region.attribute_02; l_escape_special_chars plugin_attr := p_region.attribute_24; - + function flex_field (attr_no in number, i in number) return varchar2 is d varchar2(4000); begin @@ -114,7 +138,7 @@ function get_markers end if; return apex_javascript.add_attribute('a'||attr_no,d); end flex_field; - + function varchar2_field (attr_no in number, i in number) return varchar2 is r varchar2(4000); begin @@ -123,7 +147,7 @@ function get_markers end if; return r; end varchar2_field; - + begin /* @@ -159,13 +183,18 @@ begin for i in 1..l_column_value_list(1).count loop - l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),'Latitude (#'||i||')'),g_coord_precision); - l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),'Longitude (#'||i||')'),g_coord_precision); + get_lat_lng_attr + (lat_val => l_column_value_list(1)(i) + ,lng_val => l_column_value_list(2)(i) + ,record_no => i + ,p_lat => l_lat + ,p_lng => l_lng); + l_weight := nvl(round( apex_plugin_util.get_attribute_as_number(l_column_value_list(3)(i),'Weight (#'||i||')') ),1); - -- minimise size of data to be sent + -- minimise size of data to be sent by encoding it as an array of arrays l_buf := '[' || to_char(l_lat,g_tochar_format) || ',' || to_char(l_lng,g_tochar_format) || ',' || to_char(greatest(l_weight,1)) @@ -197,8 +226,12 @@ begin for i in 1..l_column_value_list(1).count loop - l_lat := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(1)(i),'Latitude (#'||i||')'),g_coord_precision); - l_lng := round(apex_plugin_util.get_attribute_as_number(l_column_value_list(2)(i),'Longitude (#'||i||')'),g_coord_precision); + get_lat_lng_attr + (lat_val => l_column_value_list(1)(i) + ,lng_val => l_column_value_list(2)(i) + ,record_no => i + ,p_lat => l_lat + ,p_lng => l_lng); -- get flex fields, if any l_flex := null; @@ -288,18 +321,7 @@ function render l_gesture_handling plugin_attr := p_region.attribute_25; l_opt varchar2(32767); - l_buf varchar2(32767); - function valid_zoom_level (p_attr in varchar2, p_label in varchar2) return number is - n number; - begin - n := apex_plugin_util.get_attribute_as_number(p_attr, p_label); - if not n between 0 and 23 then - raise_application_error(-20000, p_label || ': must be in range 0..23 ("' || p_attr || '")'); - end if; - return n; - end valid_zoom_level; - begin -- debug information will be included if apex_application.g_debug then @@ -313,13 +335,6 @@ begin raise_application_error(-20000, 'Google Maps API Key is required (set in Component Settings)'); end if; - l_min_zoom := valid_zoom_level(p_plugin.attribute_05, 'Min. Zoom'); - l_max_zoom := valid_zoom_level(p_plugin.attribute_06, 'Max. Zoom'); - l_click_zoom_level := valid_zoom_level(p_region.attribute_03, 'Zoom Level on Click'); - l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, 'Initial Zoom Level'); - l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, 'Heatmap Opacity'); - l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, 'Heatmap Radius'); - apex_javascript.add_library (p_name => 'js?key=' || l_api_key || case when l_visualisation = g_visualisation_heatmap then @@ -346,11 +361,19 @@ begin else 'R'||p_region.id end; apex_debug.message('map region: ' || l_region_id); + + l_min_zoom := valid_zoom_level(p_plugin.attribute_05, 'Min. Zoom'); + l_max_zoom := valid_zoom_level(p_plugin.attribute_06, 'Max. Zoom'); + l_click_zoom_level := valid_zoom_level(p_region.attribute_03, 'Zoom Level on Click'); + l_initial_zoom_level := valid_zoom_level(p_region.attribute_05, 'Initial Zoom Level'); + l_heatmap_opacity := apex_plugin_util.get_attribute_as_number(p_region.attribute_13, 'Heatmap Opacity'); + l_heatmap_radius := apex_plugin_util.get_attribute_as_number(p_region.attribute_14, 'Heatmap Radius'); if l_initial_center is not null then parse_latlng(l_initial_center, p_label=>'Initial Map Center', p_lat=>l_lat, p_lng=>l_lng); end if; + -- use nullif to convert default values to null; this reduces the footprint of the generated code l_opt := '{' || apex_javascript.add_attribute('regionId', l_region_id) || apex_javascript.add_attribute('expectData', nullif(p_region.source is not null,true)) @@ -398,22 +421,14 @@ begin || apex_javascript.add_attribute('pluginFilePrefix', p_plugin.file_prefix ,false,false) || '}'; - - -- we don't want the initialisation to run until after the page is loaded including all resources; the r_ function - -- method here waits until the document is ready before running the jquery plugin initialisation - l_buf := ' - -
'; - - sys.htp.p(replace(l_buf,'#REGION_ID#',l_region_id)); + + apex_debug.message('map options: ' || l_opt); + + apex_javascript.add_onload_code(p_code => + '$("#map_' || l_region_id || '").reportmap(' || l_opt || ');' + ); + + sys.htp.p('
'); return l_result; exception