Fix svg/raster for subsymbol and subsubsu... ones

[bordoray]

Issue

close #98

変更内容:Description

• タイトルのとおり

テスト手順:Test

• Works ONLY for RasterMarker and SVGMarker
• SVGFill and RasterFill to be done when implement SVG/Raster fill JSON translate implementation, but it should works on test branch test/fill-subsymbol .

その他:Notes

• 特になし

[bordoray]

def export_assets_from(symbol: QgsSymbol, output_dir: str):
    asset_dir = get_asset_dir(output_dir)
    if not os.path.exists(asset_dir):
        os.makedirs(asset_dir)

    for symbol_layer in symbol:
        if symbol_layer.type() ....

Make makedir out of for symbol_layer in symbol: loop means assets folder will be produced even if there is no asset.

I couldn't understand why export_assets_from() is called twice inside itself

Agree that it is difficult to understand...

            if symbol_layer.layerType() not in ["RasterMarker", "SvgMarker"]:
                if symbol_layer.subSymbol():
                    export_assets_from(symbol_layer.subSymbol(), output_dir)
                continue  # skip: extract only raster or svg marker

A given symbol layer may be not RasterMarker and SvgMarker, but its subsymbol or its subsub symbol may be RasterMarker or SvgMarker. If we not call its subsymbol before continue , loop may skip its subsubsymbol

In below example which have symbol and subsymbol order:

• 1.Marker Fill
• 2.Filled marker
• 3.Line Pattern Fill
• 4.Marker Line
• 5.SVG marker (what we want to be exported) as image below Proposal code will stop analysis in 1.Marker fill (cause its not Raster nor SVG) and will not detect sub ones

I commit a mix of your refactor and what I suggest imo

[Kanahiro]

Make makedir out of for symbol_layer in symbol: loop means assets folder will be produced even if there is no asset.

I think this in not problem. Actually it is somewhat redundant but it assures the directory always exists when assets are exported, and the logic become simpler.

[Kanahiro]

How is this? I refactored

• to simplify nested codes
• not to change the logic

def export_assets_from(symbol: QgsSymbol, output_dir: str):
    asset_dir = get_asset_dir(output_dir)
    if not os.path.exists(asset_dir):
        os.makedirs(asset_dir)

    for symbol_layer in symbol:
        if symbol_layer.subSymbol():
            # recursive: if the symbol layer has sub symbol, extract from it
            export_assets_from(symbol_layer.subSymbol(), output_dir)

        if symbol_layer.type() == Qgis.SymbolType.Marker:
            # extract only raster or svg marker
            if symbol_layer.layerType() not in ["RasterMarker", "SvgMarker"]:
                continue  # if not, skip

            asset_path = os.path.join(asset_dir, get_asset_name(symbol_layer))
            shutil.copy(
                symbol_layer.path(),
                asset_path,
            )

[bordoray]

Implemented, thanks!